[arch-commits] Commit in agave/repos (12 files)
Evangelos Foutras
foutrelis at archlinux.org
Mon Dec 7 20:52:30 UTC 2015
Date: Monday, December 7, 2015 @ 21:52:29
Author: foutrelis
Revision: 150122
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
agave/repos/community-staging-i686/
agave/repos/community-staging-i686/PKGBUILD
(from rev 150121, agave/trunk/PKGBUILD)
agave/repos/community-staging-i686/agave-0.4.7-mdv-fix-str-fmt.patch
(from rev 150121, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch)
agave/repos/community-staging-i686/agave.install
(from rev 150121, agave/trunk/agave.install)
agave/repos/community-staging-i686/drop-libgnome.patch
(from rev 150121, agave/trunk/drop-libgnome.patch)
agave/repos/community-staging-i686/schemebox.patch
(from rev 150121, agave/trunk/schemebox.patch)
agave/repos/community-staging-x86_64/
agave/repos/community-staging-x86_64/PKGBUILD
(from rev 150121, agave/trunk/PKGBUILD)
agave/repos/community-staging-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch
(from rev 150121, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch)
agave/repos/community-staging-x86_64/agave.install
(from rev 150121, agave/trunk/agave.install)
agave/repos/community-staging-x86_64/drop-libgnome.patch
(from rev 150121, agave/trunk/drop-libgnome.patch)
agave/repos/community-staging-x86_64/schemebox.patch
(from rev 150121, agave/trunk/schemebox.patch)
------------------------------------------------------------+
community-staging-i686/PKGBUILD | 56 +++++++++
community-staging-i686/agave-0.4.7-mdv-fix-str-fmt.patch | 12 ++
community-staging-i686/agave.install | 22 +++
community-staging-i686/drop-libgnome.patch | 66 +++++++++++
community-staging-i686/schemebox.patch | 11 +
community-staging-x86_64/PKGBUILD | 56 +++++++++
community-staging-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch | 12 ++
community-staging-x86_64/agave.install | 22 +++
community-staging-x86_64/drop-libgnome.patch | 66 +++++++++++
community-staging-x86_64/schemebox.patch | 11 +
10 files changed, 334 insertions(+)
Copied: agave/repos/community-staging-i686/PKGBUILD (from rev 150121, agave/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2015-12-07 20:52:29 UTC (rev 150122)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=agave
+pkgver=0.4.7
+pkgrel=6
+pkgdesc="Colorscheme designer tool for GNOME"
+arch=('i686' 'x86_64')
+url="http://home.gna.org/colorscheme/"
+license=('GPL')
+depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'boost' 'cppunit')
+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
+ drop-libgnome.patch)
+md5sums=('93097881f28dcae1eca2800a763f77c3'
+ '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-staging-i686/agave-0.4.7-mdv-fix-str-fmt.patch (from rev 150121, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch)
===================================================================
--- community-staging-i686/agave-0.4.7-mdv-fix-str-fmt.patch (rev 0)
+++ community-staging-i686/agave-0.4.7-mdv-fix-str-fmt.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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());
+ }
+ }
+ }
Copied: agave/repos/community-staging-i686/agave.install (from rev 150121, agave/trunk/agave.install)
===================================================================
--- community-staging-i686/agave.install (rev 0)
+++ community-staging-i686/agave.install 2015-12-07 20:52:29 UTC (rev 150122)
@@ -0,0 +1,22 @@
+pkgname=agave
+
+post_install() {
+ gconfpkg --install ${pkgname}
+ xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate
+}
Copied: agave/repos/community-staging-i686/drop-libgnome.patch (from rev 150121, agave/trunk/drop-libgnome.patch)
===================================================================
--- community-staging-i686/drop-libgnome.patch (rev 0)
+++ community-staging-i686/drop-libgnome.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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);
+ }
+
+
Copied: agave/repos/community-staging-i686/schemebox.patch (from rev 150121, agave/trunk/schemebox.patch)
===================================================================
--- community-staging-i686/schemebox.patch (rev 0)
+++ community-staging-i686/schemebox.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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);
+ }
+
Copied: agave/repos/community-staging-x86_64/PKGBUILD (from rev 150121, agave/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2015-12-07 20:52:29 UTC (rev 150122)
@@ -0,0 +1,56 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor: Roman Kyrylych <Roman.Kyrylych at gmail.com>
+# Contributor: William Rea <sillywilly at gmail.com>
+
+pkgname=agave
+pkgver=0.4.7
+pkgrel=6
+pkgdesc="Colorscheme designer tool for GNOME"
+arch=('i686' 'x86_64')
+url="http://home.gna.org/colorscheme/"
+license=('GPL')
+depends=('libglademm' 'gconfmm' 'hicolor-icon-theme' 'xdg-utils')
+makedepends=('gnome-doc-utils' 'intltool' 'boost' 'cppunit')
+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
+ drop-libgnome.patch)
+md5sums=('93097881f28dcae1eca2800a763f77c3'
+ '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-staging-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch (from rev 150121, agave/trunk/agave-0.4.7-mdv-fix-str-fmt.patch)
===================================================================
--- community-staging-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch (rev 0)
+++ community-staging-x86_64/agave-0.4.7-mdv-fix-str-fmt.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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());
+ }
+ }
+ }
Copied: agave/repos/community-staging-x86_64/agave.install (from rev 150121, agave/trunk/agave.install)
===================================================================
--- community-staging-x86_64/agave.install (rev 0)
+++ community-staging-x86_64/agave.install 2015-12-07 20:52:29 UTC (rev 150122)
@@ -0,0 +1,22 @@
+pkgname=agave
+
+post_install() {
+ gconfpkg --install ${pkgname}
+ xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+ pre_remove $1
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+pre_remove() {
+ gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+ xdg-icon-resource forceupdate
+}
Copied: agave/repos/community-staging-x86_64/drop-libgnome.patch (from rev 150121, agave/trunk/drop-libgnome.patch)
===================================================================
--- community-staging-x86_64/drop-libgnome.patch (rev 0)
+++ community-staging-x86_64/drop-libgnome.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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);
+ }
+
+
Copied: agave/repos/community-staging-x86_64/schemebox.patch (from rev 150121, agave/trunk/schemebox.patch)
===================================================================
--- community-staging-x86_64/schemebox.patch (rev 0)
+++ community-staging-x86_64/schemebox.patch 2015-12-07 20:52:29 UTC (rev 150122)
@@ -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);
+ }
+
More information about the arch-commits
mailing list