diff --git a/README.md b/README.md index 5141f567..2a7dd7bb 100644 --- a/README.md +++ b/README.md @@ -29,8 +29,6 @@ You can use any host that runs Git. For a simple setup script, check out [Dazzle [...on Mac](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Mac/README.md) [...on Windows](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Windows/README.md) -[...on GNOME 3](https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Linux/README.GNOME3.md) - SparkleShare bundles Git on Mac on Windows. On Linux distributions you will need to to install the `git` or `git-core` package. diff --git a/SparkleShare/Linux/README.GNOME3.md b/SparkleShare/Linux/README.GNOME3.md deleted file mode 100644 index d637c98b..00000000 --- a/SparkleShare/Linux/README.GNOME3.md +++ /dev/null @@ -1,37 +0,0 @@ -## Building on GNOME 3 - -SparkleShare now successfully runs on the GNOME 3 platform! -Here's how you compile it against GTK+3 and other dependencies. - -You will still need to have the regular build dependencies installed: -https://github.com/hbons/SparkleShare/blob/master/SparkleShare/Linux/README.md - -The C# bindings that SparkleShare uses need to be recompiled against GTK+3, so -you will need to get the the dependencies from the specific locations listed -below, where they are GTK+3-enabled. - -Install the `gtk-sharp3` bindings from: -https://github.com/mono/gtk-sharp -Or on Ubuntu, get it from this PPA: -https://launchpad.net/~meebey/+archive/mono-preview - -Install the `notify-sharp` bindings from: -https://git.gnome.org/browse/notify-sharp/ - -Install the `soup-sharp` and `webkitgtk-sharp` bindings from: -https://github.com/xDarkice/soup-sharp -https://github.com/xDarkice/webkitgtk-sharp - -All with the usual: - -``` -./autogen.sh --prefix=/usr -make -sudo make install -``` - -### Ubuntu - -If you're using Ubuntu, install `appindicator-sharp` bindings from: -https://github.com/xDarkice/appindicator-sharp - diff --git a/SparkleShare/Linux/README.md b/SparkleShare/Linux/README.md index b6fc153d..a3fa37fe 100644 --- a/SparkleShare/Linux/README.md +++ b/SparkleShare/Linux/README.md @@ -1,16 +1,14 @@ ## Building on Linux distributions You can choose to build SparkleShare from source or to get the package through your distribution's repositories. - To run SparkleShare, you'll need the following packages: ``` -curl git >= 1.8 -gtk-sharp2 +gtk-sharp3 mono-core >= 2.8 notify-sharp -webkit-sharp +webkitgtk-sharp ``` **Note:** These packages may not overlap with the packages required to perform a build, so please make sure that at least the above packages are installed. @@ -20,43 +18,51 @@ Optional packages: ``` gvfs (to change file/folder icons) libappindicator (for Ubuntu integration) +curl (to make the "sparkleshare://" protocol handler work) ``` -### Installing build requirements -You can use one of the commands listed below for the most used Linux distributions: +### Installing common build requirements + +You can use one of the commands listed below for the most used Linux distributions: + +desktop-file-utils +intltool +libtool +mono-devel +mono-gmcs +mono-mcs +monodevelop +nant -#### Ubuntu -```bash -$ sudo apt-get install libappindicator0.1-cil-dev gtk-sharp2 mono-runtime mono-devel \ - monodevelop libndesk-dbus1.0-cil-dev nant libnotify-cil-dev libgtk2.0-cil-dev mono-mcs \ - mono-gmcs libwebkit-cil-dev intltool libtool libndesk-dbus-glib1.0-cil-dev +### Installing additional source build requirements + +Install the `gtk-sharp3` bindings from: +https://github.com/mono/gtk-sharp +Or on Ubuntu, get it from this PPA: +https://launchpad.net/~meebey/+archive/mono-preview + +Install the `notify-sharp` bindings from: +https://git.gnome.org/browse/notify-sharp/ + +Install the `soup-sharp` and `webkitgtk-sharp` bindings from: +https://github.com/xDarkice/soup-sharp +https://github.com/xDarkice/webkitgtk-sharp + +All with the usual: + +``` +./autogen.sh +make +sudo make install ``` -#### Fedora +If you're using Ubuntu, also install the `appindicator-sharp` bindings from: +https://github.com/xDarkice/appindicator-sharp -```bash -$ sudo yum install gtk-sharp2-devel mono-core mono-devel monodevelop ndesk-dbus-devel \ - ndesk-dbus-glib-devel nant notify-sharp-devel webkit-sharp-devel webkitgtk-devel libtool \ - intltool desktop-file-utils -``` -#### Debian - -```bash -$ sudo apt-get install gtk-sharp2 mono-runtime mono-devel monodevelop libndesk-dbus1.0-cil-dev \ - nant libnotify-cil-dev libgtk2.0-cil-dev mono-mcs mono-gmcs libwebkit-cil-dev intltool libtool \ - libndesk-dbus-glib1.0-cil-dev desktop-file-utils -``` - -#### openSUSE - -```bash -$ sudo zypper install gtk-sharp2 mono-core mono-devel monodevelop ndesk-dbus-glib-devel nant \ - desktop-file-utils notify-sharp-devel webkit-sharp libwebkitgtk-devel libtool intltool -``` ### Starting the build @@ -82,4 +88,3 @@ rm -Rf ~/.config/sparkleshare ``` sudo make uninstall ``` -