Mon Mar 26 00:01:45 UTC 2012

5 files changed, 257 insertions, 0 deletions

diff --git a/community/gdesklets/PKGBUILD b/community/gdesklets/PKGBUILD
new file mode 100644
index 000000000..197781d7c
--- /dev/null
+++ b/community/gdesklets/PKGBUILD
@@ -0,0 +1,48 @@
+# $Id: PKGBUILD 68406 2012-03-24 09:48:30Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: nifan <carlos@nifan.tk>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+
+pkgname=gdesklets
+pkgver=0.36.3
+pkgrel=4
+pkgdesc="System for bringing mini programs (desklets) onto your desktop"
+arch=('i686' 'x86_64')
+url="http://gdesklets.de/"
+license=('GPL') 
+depends=('libgtop' 'librsvg' 'pygtk' 'desktop-file-utils' 'gnome-icon-theme' 'xdg-utils')
+makedepends=('gnome-python' 'intltool')
+options=(!libtool)
+install=$pkgname.install
+source=(http://gdesklets.de/files/$pkgname-$pkgver.tar.bz2
+        gdesklets-core-0.36.3-.in-files.patch
+        fix-vfs.patch
+        make-gconf-optional.patch)
+md5sums=('60c0c4e7301b3e653702b6fe5bf7e698'
+         '27839bbefc2f6664ff31cff2d48dfeed'
+         '55ac07d16a571f29033495307c4d0f0c'
+         '45e81dd0fb20157bb840d006c3a4e2ea')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -Np0 -i "$srcdir/gdesklets-core-0.36.3-.in-files.patch"
+  patch -Np1 -i "$srcdir/fix-vfs.patch"
+  # https://code.launchpad.net/~ballogy/gdesklets/optional-use-gconf-appindicator/+merge/95809
+  patch -Np1 -i "$srcdir/make-gconf-optional.patch"
+
+  find . -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  sed -i 's/python -c/$PYTHON -c/' configure.ac
+  sed -i 's/python/python2/' shell/plugins/PackageInstaller/__init__.py
+
+  autoreconf -fi
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=python2
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
diff --git a/community/gdesklets/fix-vfs.patch b/community/gdesklets/fix-vfs.patch
new file mode 100644
index 000000000..34f51f5f6
--- /dev/null
+++ b/community/gdesklets/fix-vfs.patch
@@ -0,0 +1,11 @@
+diff -Naur gdesklets-0.36.3.orig/utils/vfs.py gdesklets-0.36.3/utils/vfs.py
+--- gdesklets-0.36.3.orig/utils/vfs.py	2008-03-20 00:00:59.000000000 +0100
++++ gdesklets-0.36.3/utils/vfs.py	2012-01-10 03:40:42.026593299 +0100
+@@ -21,7 +21,6 @@
+         OPEN_WRITE = gnomevfs.OPEN_WRITE
+ 
+     except ImportError:
+-        log("Using urllib, because gnomevfs isn't available")
+         OPEN_READ = "r"
+         OPEN_WRITE = "w"
+ 
diff --git a/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch b/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch
new file mode 100644
index 000000000..fc8753e46
--- /dev/null
+++ b/community/gdesklets/gdesklets-core-0.36.3-.in-files.patch
@@ -0,0 +1,149 @@
+=== modified file 'Makefile.am'
+--- Makefile.am	2010-12-14 10:24:59 +0000
++++ Makefile.am	2011-01-31 01:20:58 +0000
+@@ -11,8 +11,12 @@
+ autostartdir = $(sysconfdir)/xdg/autostart
+ sharedmimepackagedir = $(datadir)/mime/packages
+ mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
++pixmapdir = $(datadir)/pixmaps
+ basicdeskletsdir = ${installdir}
+ 
++# initialize this so we can add to it later
++nobase_dist_install_DATA =
++
+ include Makefile_gdesklets.am
+ include Makefile_python.am
+ 
+
+=== modified file 'Makefile_gdesklets.am'
+--- Makefile_gdesklets.am	2011-01-06 11:01:06 +0000
++++ Makefile_gdesklets.am	2011-01-31 01:20:58 +0000
+@@ -1,12 +1,14 @@
+ # Set the LDFLAGS for this section
+ AM_LDFLAGS = -module -avoid-version -as-needed
+ 
++# Libraries that get installed in these exact subdirectories
+ nobase_install_LTLIBRARIES = \
+   libdesklets/system/gtop.la \
+   utils/svg.la               \
+   utils/tiling.la            \
+   utils/x11.la
+ 
++# Scripts that get distributed and installed
+ dist_install_SCRIPTS =             \
+   ctrlinfo                         \
+   gdesklets                        \
+@@ -16,38 +18,62 @@
+   gdesklets-shell                  \
+   test-control.py
+ 
++# "System" scripts that get distributed but not installed
+ dist_noinst_SCRIPTS = autogen.sh
+ 
++# Man page
+ dist_man_MANS = doc/man/gdesklets.1
+ 
+-EXTRA_DIST =             \
+-  AUTHORS                \
+-  COPYING                \
+-  README                 \
+-  TODO                   \
+-  NEWS                   \
+-  contrib/bash/gdesklets
+-
++# The .desktop file
++desktop_in_files = data/gdesklets.desktop.in
++# The shared mime XML file
++sharedmimepackage_in_files = data/gdesklets.xml.in
++
++# Other odds and ends that get distributed, but not installed
++# It's up to distro package maintainers to install these
++EXTRA_DIST =                                          \
++  AUTHORS                                             \
++  COPYING                                             \
++  README                                              \
++  TODO                                                \
++  NEWS                                                \
++  contrib/bash/gdesklets                              \
++  $(desktop_in_files)                                 \
++  $(sharedmimepackage_in_files)
++
++# Docs and images that get distributed and installed to these specific
++# directories
++nobase_dist_install_DATA +=                 \
++  doc/basic/gdesklets-doc.xml               \
++  doc/basic/Images/desklet-context-menu.png \
++  doc/basic/Images/desklet-start-shell.png  \
++  doc/basic/Images/gdesklets.png            \
++  doc/basic/Images/open-command.png         \
++  doc/basic/Images/preferences.png          \
++  doc/basic/Images/profile.png              \
++  doc/basic/Images/remote.png               \
++  doc/basic/Images/shell.png                \
++  data/about.png                            \
++  data/gdesklets.png
++
++# Additional files that get cleaned by distclean
+ # See http://www.gnu.org/software/hello/manual/automake/Clean.html
+ CLEANFILES =   \
+   po/.intltool-merge-cache
+ 
+ # The .desktop file
+-desktop_in_files = data/gdesklets.desktop.in
+-dist_desktop_DATA= $(desktop_in_files)
+ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ autostart_DATA = $(desktop_in_files:.desktop.in=.desktop)
+ @INTLTOOL_DESKTOP_RULE@
+ 
+ # The shared mime XML file
+-sharedmimepackage_in_files = data/gdesklets.xml.in
+-dist_sharedmimepackage_DATA = $(sharedmimepackage_in_files)
+ sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
+ @INTLTOOL_XML_RULE@
+ 
+ # And the mime icon
+-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+ 
++# Note, this gets installed in both $(pixmapdir) and $(installdir)
+ pixmap_DATA = data/gdesklets.png
+ 
+ libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
+
+=== modified file 'Makefile_python.am'
+--- Makefile_python.am	2010-12-14 10:24:59 +0000
++++ Makefile_python.am	2011-01-31 01:20:58 +0000
+@@ -1,4 +1,4 @@
+-nobase_dist_install_DATA =              \
++nobase_dist_install_DATA +=             \
+ 	Controls/__init__.py	\
+ 	Controls/ArrayBuffer/__init__.py \
+ 	Controls/ArrayBuffer/IArrayBuffer.py \
+@@ -48,21 +48,6 @@
+ 	config/DisplayConfigger.py \
+ 	config/StateSaver.py     \
+ 	config/settings.py \
+-	data/about.png                               \
+-	data/calendar.png                            \
+-	data/gdesklets.desktop                       \
+-	data/gdesklets.png                           \
+-	data/gdesklets.xml                           \
+-	data/gnome-mime-application-x-gdesklets-display.png \
+-	doc/basic/gdesklets-doc.xml \
+-	doc/basic/Images/desklet-context-menu.png	\
+-	doc/basic/Images/desklet-start-shell.png		\
+-	doc/basic/Images/gdesklets.png	        	\
+-	doc/basic/Images/open-command.png		\
+-	doc/basic/Images/preferences.png			\
+-	doc/basic/Images/profile.png			\
+-	doc/basic/Images/remote.png			\
+-	doc/basic/Images/shell.png \
+ 	display/__init__.py            \
+ 	display/ContainerTarget.py     \
+ 	display/DataTarget.py          \
+@@ -212,4 +197,3 @@
+ 	utils/typeconverter.py    \
+ 	utils/vfs.py              \
+ 	utils/xdr.py
+-
+
diff --git a/community/gdesklets/gdesklets.install b/community/gdesklets/gdesklets.install
new file mode 100644
index 000000000..9ba94ee6b
--- /dev/null
+++ b/community/gdesklets/gdesklets.install
@@ -0,0 +1,13 @@
+post_install() {
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+  xdg-icon-resource forceupdate --theme gnome
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/community/gdesklets/make-gconf-optional.patch b/community/gdesklets/make-gconf-optional.patch
new file mode 100644
index 000000000..8a9e9c2b8
--- /dev/null
+++ b/community/gdesklets/make-gconf-optional.patch
@@ -0,0 +1,36 @@
+diff -Naur gdesklets-0.36.3.orig/shell/plugins/PackageInstaller/Downloader.py gdesklets-0.36.3/shell/plugins/PackageInstaller/Downloader.py
+--- gdesklets-0.36.3.orig/shell/plugins/PackageInstaller/Downloader.py	2008-03-20 00:00:58.000000000 +0100
++++ gdesklets-0.36.3/shell/plugins/PackageInstaller/Downloader.py	2012-01-10 02:58:26.451869752 +0100
+@@ -61,16 +61,22 @@
+ 
+         dest_fd = open(dest, "w")
+ 
+-        import gconf
+-        client = gconf.client_get_default()
+-        use_proxy = client.get_bool('/system/http_proxy/use_http_proxy')
+-        if (use_proxy != 0):
+-           host = client.get_string('/system/http_proxy/host')
+-           port = client.get_int('/system/http_proxy/port')
+-           if (host != ""):
+-               http_proxy = "http://" + host + ':' + str(port)
+-           else:
+-               http_proxy = None
++        try:
++            import gconf
++        except ImportError:
++            gconf = None
++        if gconf:
++            client = gconf.client_get_default()
++            use_proxy = client.get_bool('/system/http_proxy/use_http_proxy')
++            if (use_proxy != 0):
++               host = client.get_string('/system/http_proxy/host')
++               port = client.get_int('/system/http_proxy/port')
++               if (host != ""):
++                   http_proxy = "http://" + host + ':' + str(port)
++               else:
++                   http_proxy = None
++            else:
++                http_proxy = None
+         else:
+             http_proxy = None
+