Date: Sunday, January 14, 2018 @ 00:21:10 Author: bgyorgy Revision: 281868
archrelease: copy trunk to community-x86_64 Added: agave/repos/community-x86_64/PKGBUILD (from rev 281867, agave/trunk/PKGBUILD) agave/repos/community-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch (from rev 281867, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch) agave/repos/community-x86_64/drop-libgnome.patch (from rev 281867, agave/trunk/drop-libgnome.patch) agave/repos/community-x86_64/schemebox.patch (from rev 281867, agave/trunk/schemebox.patch) Deleted: agave/repos/community-x86_64/PKGBUILD agave/repos/community-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch agave/repos/community-x86_64/drop-libgnome.patch agave/repos/community-x86_64/schemebox.patch -----------------------------------+ PKGBUILD | 107 +++++++++++++---------------- agave-0.4.7-mdv-fix-str-fmt.patch | 24 +++--- drop-libgnome.patch | 132 ++++++++++++++++++------------------ schemebox.patch | 22 +++--- 4 files changed, 139 insertions(+), 146 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2018-01-14 00:21:03 UTC (rev 281867) +++ PKGBUILD 2018-01-14 00:21:10 UTC (rev 281868) @@ -1,57 +0,0 @@ -# $Id$ -# Maintainer: Balló György <ballogyor+arch at gmail dot com> -# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> -# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> -# Contributor: William Rea <sillywi...@gmail.com> - -pkgname=agave -pkgver=0.4.7 -pkgrel=8 -pkgdesc="Colorscheme designer tool for GNOME" -arch=('i686' 'x86_64') -url="http://web.archive.org/web/20170308183221/http://home.gna.org/colorscheme/" -license=('GPL') -depends=('libglademm' 'gconfmm') -makedepends=('gnome-doc-utils' 'intltool' 'boost' 'cppunit') -source=("http://web.archive.org/web/20170227035931/http://download.gna.org/colorscheme/releases/$pkgname-$pkgver.tar.bz2"{,.sig} - agave-0.4.7-mdv-fix-str-fmt.patch - schemebox.patch - drop-libgnome.patch) -validpgpkeys=('CAD6D32E41FEE86D519CBC60945C0F11A1C5E0E3') # Jonathon Jongsma -md5sums=('93097881f28dcae1eca2800a763f77c3' - 'SKIP' - 'd96ddfe751d8fd4d13a443b94fafb0b6' - 'c41adfd52ecbf837f4338e67693640fc' - '7419d23329f847dcde12baa467b52135') - -prepare() { - cd "$srcdir/$pkgname-$pkgver" - - # Build fix from Fedora - patch -Np1 -i "$srcdir/agave-0.4.7-mdv-fix-str-fmt.patch" - - # Another build fix - patch -Np1 -i "$srcdir/schemebox.patch" - - # Remove deprecated libgnome dependency - patch -Np1 -i "$srcdir/drop-libgnome.patch" -} - -build() { - cd "$srcdir/$pkgname-$pkgver" - CXXFLAGS+=' -std=c++11' - ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ - --disable-scrollkeeper --disable-gnome --disable-schemas-install \ - --with-gconf-schema-file-dir=/usr/share/gconf/schemas - make -} - -check() { - cd "$srcdir/$pkgname-$pkgver" - make check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install -} Copied: agave/repos/community-x86_64/PKGBUILD (from rev 281867, agave/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-01-14 00:21:10 UTC (rev 281868) @@ -0,0 +1,50 @@ +# $Id$ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> +# Contributor: Roman Kyrylych <roman.kyryl...@gmail.com> +# Contributor: William Rea <sillywi...@gmail.com> + +pkgname=agave +pkgver=0.4.7 +pkgrel=9 +pkgdesc="Colorscheme designer tool for GNOME" +arch=('x86_64') +url="https://web.archive.org/web/20170327063642/http://home.gna.org/colorscheme/" +license=('GPL') +depends=('libglademm' 'gconfmm') +makedepends=('gnome-doc-utils' 'intltool' 'boost') +source=(http://ftp.debian.org/debian/pool/main/a/$pkgname/${pkgname}_$pkgver.orig.tar.gz + agave-0.4.7-mdv-fix-str-fmt.patch + schemebox.patch + drop-libgnome.patch) +sha256sums=('4005361ab1b137029c7d50afbbfbae7d83bdde7cec3e155a85eed59f6ec4e6fc' + '132008f0bbe040c59bbc134d9ca3eb244967a66f95bf113d94e976b8ed776c6c' + '0471ac9d7057f83d3fc667d7387837a2d85cb0d15a58853dd673a6ea1459623c' + '8651250047b5882b00d28ac6d7ff587f53f99bd681c201545b6cf25c5acaaac6') + +prepare() { + cd $pkgname-$pkgver + + # Build fix from Fedora + patch -Np1 -i ../agave-0.4.7-mdv-fix-str-fmt.patch + + # Another build fix + patch -Np1 -i ../schemebox.patch + + # Remove deprecated libgnome dependency + patch -Np1 -i ../drop-libgnome.patch +} + +build() { + cd $pkgname-$pkgver + CXXFLAGS+=' -std=c++11' + ./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 $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} Deleted: agave-0.4.7-mdv-fix-str-fmt.patch =================================================================== --- agave-0.4.7-mdv-fix-str-fmt.patch 2018-01-14 00:21:03 UTC (rev 281867) +++ agave-0.4.7-mdv-fix-str-fmt.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -1,12 +0,0 @@ -diff -p -up agave-0.4.7/src/dialogs/gcs-about-window.cc.strfmt agave-0.4.7/src/dialogs/gcs-about-window.cc ---- agave-0.4.7/src/dialogs/gcs-about-window.cc.strfmt 2009-11-25 15:00:03.000000000 +0100 -+++ agave-0.4.7/src/dialogs/gcs-about-window.cc 2009-11-25 15:31:43.000000000 +0100 -@@ -105,7 +105,7 @@ namespace gcs - catch (const Glib::Error& e) - { - Glib::ustring message = "Couldn't load Agave logo image from theme. " + e.what(); -- g_warning(message.c_str()); -+ g_warning("%s", message.c_str()); - } - } - } Copied: agave/repos/community-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch (from rev 281867, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch) =================================================================== --- agave-0.4.7-mdv-fix-str-fmt.patch (rev 0) +++ agave-0.4.7-mdv-fix-str-fmt.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -0,0 +1,12 @@ +diff -p -up agave-0.4.7/src/dialogs/gcs-about-window.cc.strfmt agave-0.4.7/src/dialogs/gcs-about-window.cc +--- agave-0.4.7/src/dialogs/gcs-about-window.cc.strfmt 2009-11-25 15:00:03.000000000 +0100 ++++ agave-0.4.7/src/dialogs/gcs-about-window.cc 2009-11-25 15:31:43.000000000 +0100 +@@ -105,7 +105,7 @@ namespace gcs + catch (const Glib::Error& e) + { + Glib::ustring message = "Couldn't load Agave logo image from theme. " + e.what(); +- g_warning(message.c_str()); ++ g_warning("%s", message.c_str()); + } + } + } Deleted: drop-libgnome.patch =================================================================== --- drop-libgnome.patch 2018-01-14 00:21:03 UTC (rev 281867) +++ drop-libgnome.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -1,66 +0,0 @@ -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); - } - - Copied: agave/repos/community-x86_64/drop-libgnome.patch (from rev 281867, agave/trunk/drop-libgnome.patch) =================================================================== --- drop-libgnome.patch (rev 0) +++ drop-libgnome.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -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); + } + + Deleted: schemebox.patch =================================================================== --- schemebox.patch 2018-01-14 00:21:03 UTC (rev 281867) +++ schemebox.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -1,11 +0,0 @@ ---- agave-0.4.7/src/widgets/gcs-schemebox.cc 2008-02-25 21:07:02.000000000 -0600 -+++ agave-0.4.7/src/widgets/gcs-schemebox.cc.new 2010-05-24 00:28:51.000000000 -0500 -@@ -45,7 +45,7 @@ namespace gcs - - SchemeBox::SchemeBox(Scheme schm) - { -- SchemeBox::SchemeBox(); -+ SchemeBox(); - set_scheme(schm); - } - Copied: agave/repos/community-x86_64/schemebox.patch (from rev 281867, agave/trunk/schemebox.patch) =================================================================== --- schemebox.patch (rev 0) +++ schemebox.patch 2018-01-14 00:21:10 UTC (rev 281868) @@ -0,0 +1,11 @@ +--- agave-0.4.7/src/widgets/gcs-schemebox.cc 2008-02-25 21:07:02.000000000 -0600 ++++ agave-0.4.7/src/widgets/gcs-schemebox.cc.new 2010-05-24 00:28:51.000000000 -0500 +@@ -45,7 +45,7 @@ namespace gcs + + SchemeBox::SchemeBox(Scheme schm) + { +- SchemeBox::SchemeBox(); ++ SchemeBox(); + set_scheme(schm); + } +