diff options
Diffstat (limited to 'agave')
| -rw-r--r-- | agave/.SRCINFO | 18 | ||||
| -rw-r--r-- | agave/.gitignore | 6 | ||||
| -rw-r--r-- | agave/PKGBUILD | 51 | ||||
| -rw-r--r-- | agave/agave-0.4.7-mdv-fix-str-fmt.patch | 12 | ||||
| -rw-r--r-- | agave/drop-libgnome.patch | 64 | ||||
| -rw-r--r-- | agave/fix-build-without-gconf.patch | 55 | ||||
| -rw-r--r-- | agave/schemebox.patch | 10 |
7 files changed, 216 insertions, 0 deletions
diff --git a/agave/.SRCINFO b/agave/.SRCINFO new file mode 100644 index 0000000..7cf5dac --- /dev/null +++ b/agave/.SRCINFO @@ -0,0 +1,18 @@ +pkgbase = agave + pkgdesc = Colorscheme designer tool for GNOME + pkgver = 0.4.7 + pkgrel = 604 + url = https://web.archive.org/web/20170327063642/http://home.gna.org/colorscheme/ + arch = x86_64 + license = GPL + makedepends = gnome-doc-utils + makedepends = intltool + makedepends = boost + depends = libglademm + source = http://archive.ubuntu.com/ubuntu/pool/universe/a/agave/agave_0.4.7.orig.tar.gz + source = agave-0.4.7-mdv-fix-str-fmt.patch + source = schemebox.patch + source = drop-libgnome.patch + source = fix-build-without-gconf.patch + +pkgname = agave diff --git a/agave/.gitignore b/agave/.gitignore new file mode 100644 index 0000000..6b2b2ea --- /dev/null +++ b/agave/.gitignore @@ -0,0 +1,6 @@ +pkg/ +src/ +*.tar +*.tar.zst +*.tar.gz +*.tar.xz diff --git a/agave/PKGBUILD b/agave/PKGBUILD new file mode 100644 index 0000000..2bb8553 --- /dev/null +++ b/agave/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: +# Contributor: kj_sh604 <43.splash@gmail.com> + +pkgname=agave +pkgver=0.4.7 +pkgrel=604 +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') +makedepends=('gnome-doc-utils' 'intltool' 'boost') + +# use this source when PKGBUILD breaks in the future: +# source=(https://aedrielkylejavier.me/assets/${pkgname}_$pkgver.orig.tar.gz + +source=(http://archive.ubuntu.com/ubuntu/pool/universe/a/$pkgname/${pkgname}_$pkgver.orig.tar.gz + agave-0.4.7-mdv-fix-str-fmt.patch + schemebox.patch + drop-libgnome.patch + fix-build-without-gconf.patch) + +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 + + # Fix build without gconfmm installed + patch -Np1 -i ../fix-build-without-gconf.patch +} + +build() { + cd $pkgname-$pkgver + CXXFLAGS+=' -std=c++11' + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-scrollkeeper --disable-gnome --disable-gconf + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + rm "$pkgdir/agave.schemas" +} diff --git a/agave/agave-0.4.7-mdv-fix-str-fmt.patch b/agave/agave-0.4.7-mdv-fix-str-fmt.patch new file mode 100644 index 0000000..7487a0c --- /dev/null +++ b/agave/agave-0.4.7-mdv-fix-str-fmt.patch @@ -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()); + } + } + } diff --git a/agave/drop-libgnome.patch b/agave/drop-libgnome.patch new file mode 100644 index 0000000..1732cd4 --- /dev/null +++ b/agave/drop-libgnome.patch @@ -0,0 +1,64 @@ +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); + } diff --git a/agave/fix-build-without-gconf.patch b/agave/fix-build-without-gconf.patch new file mode 100644 index 0000000..f8735a3 --- /dev/null +++ b/agave/fix-build-without-gconf.patch @@ -0,0 +1,55 @@ +diff -Naur agave-0.4.7.orig/src/gcs-conf.cc agave-0.4.7/src/gcs-conf.cc +--- agave-0.4.7.orig/src/gcs-conf.cc 2008-02-26 04:07:02.000000000 +0100 ++++ agave-0.4.7/src/gcs-conf.cc 2018-09-05 13:00:23.733940123 +0200 +@@ -26,6 +26,7 @@ + #include "config.h" + #include "gcs-conf.h" + #include "core/gcs-color.h" ++#include <glibmm.h> + #ifdef HAVE_GCONFMM + #include <gconfmm/client.h> + #include <gconfmm/value.h> +@@ -36,6 +37,7 @@ + // gconf recommends storing enumerations as strings rather than integers + // since it's more robust against changes in enumeration order and is more + // human-readable. This is a helper for gconf_string_to_enum and vice versa ++#ifdef HAVE_GCONFMM + static GConfEnumStringPair schemetype_lookup_table[] = + { + { SCHEME_COMPLEMENTS, "COMPLEMENTS" }, +@@ -59,6 +61,7 @@ + operator double() { return get_float(); } + operator float() { return get_float(); } + }; ++#endif // HAVE_GCONFMM + + const Glib::ustring Conf::APP_DIR = "/apps/agave"; + +@@ -128,8 +131,10 @@ + + void Conf::set_last_scheme_type(tSchemeType t) + { ++#ifdef HAVE_GCONFMM + Glib::ustring schemetype_string = gconf_enum_to_string(schemetype_lookup_table, t); + set_value(KEY_LAST_SCHEME_TYPE, schemetype_string); ++#endif // HAVE_GCONFMM + } + + +@@ -137,12 +142,16 @@ + { + Glib::ustring scheme_type; + tSchemeType t; ++#ifdef HAVE_GCONFMM + if (!get_value(KEY_LAST_SCHEME_TYPE, scheme_type) || + !gconf_string_to_enum(schemetype_lookup_table, + scheme_type.c_str(), reinterpret_cast<int*>(&t))) + { ++#endif // HAVE_GCONFMM + t = SCHEME_TRIADS; ++#ifdef HAVE_GCONFMM + } ++#endif // HAVE_GCONFMM + return t; + } + diff --git a/agave/schemebox.patch b/agave/schemebox.patch new file mode 100644 index 0000000..c1b25c6 --- /dev/null +++ b/agave/schemebox.patch @@ -0,0 +1,10 @@ +--- 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); + } |