Thu Mar 22 00:01:28 UTC 2012

3 files changed, 88 insertions, 27 deletions

diff --git a/community/agave/PKGBUILD b/community/agave/PKGBUILD
index ebee489f0..458e721c6 100644
--- a/community/agave/PKGBUILD
+++ b/community/agave/PKGBUILD
@@ -1,45 +1,42 @@
-# $Id: PKGBUILD 66590 2012-02-26 13:20:19Z lfleischer $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# $Id: PKGBUILD 68265 2012-03-20 22:39:06Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=agave
 pkgver=0.4.7
-pkgrel=3
-pkgdesc="An colorscheme designer for the Gnome desktop"
+pkgrel=4
+pkgdesc="Colorscheme designer tool for GNOME"
 arch=('i686' 'x86_64')
-url="http://home.gna.org/colorscheme"
+url="http://home.gna.org/colorscheme/"
 license=('GPL')
-depends=('gtkmm' 'libgnomeui' 'libglademm' 'gconfmm>=2.18.1' 'hicolor-icon-theme')
-makedepends=('intltool' 'boost' 'gnome-doc-utils>=0.11.2')
-install=agave.install
+depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'boost')
+install=$pkgname.install
 source=("http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2"
         agave-0.4.7-mdv-fix-str-fmt.patch
-        schemebox.patch)
+        schemebox.patch
+        drop-libgnome.patch)
 md5sums=('93097881f28dcae1eca2800a763f77c3'
          'd96ddfe751d8fd4d13a443b94fafb0b6'
-         'c41adfd52ecbf837f4338e67693640fc')
+         'c41adfd52ecbf837f4338e67693640fc'
+         '7419d23329f847dcde12baa467b52135')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" # Fedora patch
   patch -Np1 -i "$srcdir/schemebox.patch" # gcs-schemebox patch
+  patch -Np1 -i "$srcdir/drop-libgnome.patch"
 
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --disable-scrollkeeper 
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-scrollkeeper --disable-gnome --disable-schemas-install \
+              --with-gconf-schema-file-dir=/usr/share/gconf/schemas
   make
 }
 
 package() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
-
-  mkdir -p "$pkgdir/usr/share/gconf/schemas"
-  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
-    "$pkgdir/etc/gconf/schemas"/*.schemas
-  rm -rf "$pkgdir/usr/etc"
-
-  sed -i "s/agave-icon.png/agave.png/" "$pkgdir/usr/share/applications/agave.desktop"
-  rm -f "${pkgdir}/etc/gconf/schemas"/*.schemas
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/agave/agave.install b/community/agave/agave.install
index 41343c50b..cb851dbc3 100644
--- a/community/agave/agave.install
+++ b/community/agave/agave.install
@@ -1,9 +1,8 @@
 pkgname=agave
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
+  gconfpkg --install ${pkgname}
+  xdg-icon-resource forceupdate
 }
 
 pre_upgrade() {
@@ -15,10 +14,9 @@ post_upgrade() {
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  gconfpkg --uninstall ${pkgname}
 }
 
 post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
+  xdg-icon-resource forceupdate
 }
diff --git a/community/agave/drop-libgnome.patch b/community/agave/drop-libgnome.patch
new file mode 100644
index 000000000..5dd704e34
--- /dev/null
+++ b/community/agave/drop-libgnome.patch
@@ -0,0 +1,66 @@
+diff -Naur agave-0.4.4.orig/src/dialogs/gcs-about-window.cc agave-0.4.4/src/dialogs/gcs-about-window.cc
+--- agave-0.4.4.orig/src/dialogs/gcs-about-window.cc	2007-11-02 04:16:16.000000000 +0100
++++ agave-0.4.4/src/dialogs/gcs-about-window.cc	2012-03-20 22:01:55.835021376 +0100
+@@ -26,9 +26,6 @@
+ #include <cstring>  // for strlen()
+ 
+ #include <config.h>
+-#ifdef HAVE_GNOME
+-#include <libgnome/gnome-url.h>
+-#endif // HAVE_GNOME
+ 
+ #include <gtkmm/icontheme.h>
+ 
+@@ -46,11 +43,8 @@
+         {
+             set_name(PACKAGE_NAME);
+ 
+-#ifdef HAVE_GNOME
+-            set_url_hook(sigc::mem_fun(*this, &AboutWindow::on_link_clicked));
+             set_website(PACKAGE_WEBSITE);
+             set_website_label(_("Project Website"));
+-#endif // HAVE_GNOME
+ 
+             Glib::ustring version(PACKAGE_VERSION);
+             set_version(version);
+@@ -112,15 +106,6 @@
+ 
+ 
+         void
+-        AboutWindow::on_link_clicked(Gtk::AboutDialog& dialog,
+-                const Glib::ustring& link)
+-        {
+-#ifdef HAVE_GNOME
+-            gnome_url_show(link.c_str(), 0);
+-#endif // HAVE_GNOME
+-        }
+-
+-        void
+         AboutWindow::on_response(int response_id)
+         {
+             if (response_id == Gtk::RESPONSE_DELETE_EVENT ||
+diff -Naur agave-0.4.4.orig/src/gcs-mainwindow-actions.cc agave-0.4.4/src/gcs-mainwindow-actions.cc
+--- agave-0.4.4.orig/src/gcs-mainwindow-actions.cc	2007-11-02 04:01:16.000000000 +0100
++++ agave-0.4.4/src/gcs-mainwindow-actions.cc	2012-03-20 22:01:10.637760066 +0100
+@@ -25,7 +25,6 @@
+ 
+ #include <vector>
+ #include <gtk/gtk.h>
+-#include <libgnome/gnome-help.h>
+ #include <gtkmm/iconfactory.h>
+ #include <gtkmm/stock.h>
+ #include <gtkmm/clipboard.h>
+@@ -251,9 +250,10 @@
+     /* Help Menu Actions */
+     void MainWindow::on_action_help_contents(void)
+     {
+-        gnome_help_display("agave.xml",
+-                NULL /* link id */,
+-                NULL /* GError */);
++        gtk_show_uri (NULL,
++                "ghelp:agave",
++                gtk_get_current_event_time (),
++                NULL);
+     }
+ 
+