Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

3 files changed, 256 insertions, 0 deletions

diff --git a/nonprism/gthumb/PKGBUILD b/nonprism/gthumb/PKGBUILD
new file mode 100644
index 000000000..7e379542d
--- /dev/null
+++ b/nonprism/gthumb/PKGBUILD
@@ -0,0 +1,58 @@
+# $Id: PKGBUILD 213426 2014-05-23 22:54:51Z heftig $
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
+
+pkgname=gthumb
+pkgver=3.2.8
+pkgrel=1.nonprism1
+pkgdesc="Image browser and viewer for the GNOME Desktop, without support for unsafe and dangerous for privacy protocols"
+arch=(i686 x86_64)
+license=(GPL)
+url="http://live.gnome.org/gthumb"
+replaces=(${pkgname}-nonprism)
+conflicts=(${pkgname}-nonprism)
+depends=(desktop-file-utils hicolor-icon-theme dconf librsvg clutter-gtk
+         gst-plugins-base-libs gsettings-desktop-schemas libwebp libsecret
+         libsoup webkitgtk json-glib)
+makedepends=(intltool libchamplain libopenraw exiv2 itstool brasero librsvg libopenraw liboauth docbook-xsl)
+optdepends=('libopenraw: read RAW files'
+            'exiv2: metadata support'
+            'libchamplain: map viewer'
+            'brasero: burn discs'
+            'liboauth: web albums')
+options=('!emptydirs')
+install=gthumb.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
+        nonprism.patch)
+sha256sums=('d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8'
+            '7706181514c9cfe0241329e9b14778dfa2797ddc1feb206b1cd9f07f9be31490')
+
+prepare() {
+  cd $pkgname-$pkgver
+  patch -Np1 -i $srcdir/nonprism.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --localstatedir=/var --disable-static \
+      --enable-libchamplain --enable-libopenraw
+  
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/      func_append compile_command " -Wl,-O1,--as-needed"\n      func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool
+
+  make
+}
+
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+}
diff --git a/nonprism/gthumb/gthumb.install b/nonprism/gthumb/gthumb.install
new file mode 100644
index 000000000..9d4e7822f
--- /dev/null
+++ b/nonprism/gthumb/gthumb.install
@@ -0,0 +1,19 @@
+post_install() {
+  glib-compile-schemas /usr/share/glib-2.0/schemas
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
+}
+
+pre_upgrade() {
+  if (( $(vercmp $2 2.90.1) < 0 )); then
+    gconfpkg --uninstall gthumb
+  fi
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/nonprism/gthumb/nonprism.patch b/nonprism/gthumb/nonprism.patch
new file mode 100644
index 000000000..0bdde908f
--- /dev/null
+++ b/nonprism/gthumb/nonprism.patch
@@ -0,0 +1,179 @@
+diff -Nur gthumb-3.2.7.orig/data/Makefile.am gthumb-3.2.7/data/Makefile.am
+--- gthumb-3.2.7.orig/data/Makefile.am	2013-04-30 13:56:12.000000000 -0300
++++ gthumb-3.2.7/data/Makefile.am	2014-04-19 12:30:38.520987588 -0300
+@@ -16,15 +16,12 @@
+ 	org.gnome.gthumb.contact-sheet.gschema.xml.in		\
+ 	org.gnome.gthumb.convert-format.gschema.xml.in		\
+ 	org.gnome.gthumb.crop.gschema.xml.in			\
+-	org.gnome.gthumb.facebook.gschema.xml.in		\
+ 	org.gnome.gthumb.file-manager.gschema.xml.in		\
+-	org.gnome.gthumb.flickr.gschema.xml.in			\
+ 	org.gnome.gthumb.gstreamer-tools.gschema.xml.in		\
+ 	org.gnome.gthumb.image-print.gschema.xml.in		\
+ 	org.gnome.gthumb.image-viewer.gschema.xml.in		\
+ 	org.gnome.gthumb.importer.gschema.xml.in		\
+ 	org.gnome.gthumb.photo-importer.gschema.xml.in		\
+-	org.gnome.gthumb.picasaweb.gschema.xml.in		\
+ 	org.gnome.gthumb.pixbuf-savers.gschema.xml.in		\
+ 	org.gnome.gthumb.rename-series.gschema.xml.in		\
+ 	org.gnome.gthumb.resize.gschema.xml.in			\
+diff -Nur gthumb-3.2.7.orig/data/Makefile.in gthumb-3.2.7/data/Makefile.in
+--- gthumb-3.2.7.orig/data/Makefile.in	2014-03-25 17:22:56.000000000 -0300
++++ gthumb-3.2.7/data/Makefile.in	2014-04-19 12:30:16.910790641 -0300
+@@ -433,15 +433,12 @@
+ 	org.gnome.gthumb.contact-sheet.gschema.xml.in		\
+ 	org.gnome.gthumb.convert-format.gschema.xml.in		\
+ 	org.gnome.gthumb.crop.gschema.xml.in			\
+-	org.gnome.gthumb.facebook.gschema.xml.in		\
+ 	org.gnome.gthumb.file-manager.gschema.xml.in		\
+-	org.gnome.gthumb.flickr.gschema.xml.in			\
+ 	org.gnome.gthumb.gstreamer-tools.gschema.xml.in		\
+ 	org.gnome.gthumb.image-print.gschema.xml.in		\
+ 	org.gnome.gthumb.image-viewer.gschema.xml.in		\
+ 	org.gnome.gthumb.importer.gschema.xml.in		\
+ 	org.gnome.gthumb.photo-importer.gschema.xml.in		\
+-	org.gnome.gthumb.picasaweb.gschema.xml.in		\
+ 	org.gnome.gthumb.pixbuf-savers.gschema.xml.in		\
+ 	org.gnome.gthumb.rename-series.gschema.xml.in		\
+ 	org.gnome.gthumb.resize.gschema.xml.in			\
+diff -Nur gthumb-3.2.7.orig/data/gthumb.convert gthumb-3.2.7/data/gthumb.convert
+--- gthumb-3.2.7.orig/data/gthumb.convert	2013-04-30 13:56:12.000000000 -0300
++++ gthumb-3.2.7/data/gthumb.convert	2014-04-19 12:55:21.982561697 -0300
+@@ -79,9 +79,6 @@
+ [org.gnome.gthumb.dialogs.add-to-catalog]
+ view = /apps/gthumb/general/add_to_catalog/view
+ 
+-[org.gnome.gthumb.facebook]
+-max-resolution = /apps/gthumb/ext/facebook/max_resolution
+-
+ [org.gnome.gthumb.file-manager]
+ last-folder = /apps/gthumb/ext/file_manager/copy_move/last_folder
+ view-destination = /apps/gthumb/ext/file_manager/copy_move/view_destination
+@@ -125,9 +122,6 @@
+ delete-from-device = /apps/gthumb/ext/photo_importer/delete_from_device
+ adjust-orientation = /apps/gthumb/ext/photo_importer/adjust_orientation
+ 
+-[org.gnome.gthumb.picasaweb]
+-synchronize = /apps/gthumb/ext/picasaweb/synchronize
+-
+ [org.gnome.gthumb.pixbuf-savers.jpeg]
+ default-ext = /apps/gthumb/save_options/jpeg/default_ext
+ quality = /apps/gthumb/save_options/jpeg/quality
+diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am
+--- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.am	2013-10-11 16:11:08.000000000 -0200
++++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.am	2014-04-19 12:56:04.599700437 -0300
+@@ -19,10 +19,6 @@
+ 	selection1.png			\
+ 	selection2.png			\
+ 	selection3.png			\
+-	site-facebook.png		\
+-	site-flickr.png			\
+-	site-photobucket.png		\
+-	site-picasaweb.png		\
+ 	site-twentythree.png		\
+ 	tag.png				\
+ 	tool-adjust-colors.png		\
+diff -Nur gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in
+--- gthumb-3.2.7.orig/data/icons/hicolor/16x16/actions/Makefile.in	2014-03-25 17:22:56.000000000 -0300
++++ gthumb-3.2.7/data/icons/hicolor/16x16/actions/Makefile.in	2014-04-19 12:56:16.376495364 -0300
+@@ -371,10 +371,6 @@
+ 	selection1.png			\
+ 	selection2.png			\
+ 	selection3.png			\
+-	site-facebook.png		\
+-	site-flickr.png			\
+-	site-photobucket.png		\
+-	site-picasaweb.png		\
+ 	site-twentythree.png		\
+ 	tag.png				\
+ 	tool-adjust-colors.png		\
+diff -Nur gthumb-3.2.7.orig/extensions/Makefile.am gthumb-3.2.7/extensions/Makefile.am
+--- gthumb-3.2.7.orig/extensions/Makefile.am	2013-04-30 13:56:12.000000000 -0300
++++ gthumb-3.2.7/extensions/Makefile.am	2014-04-19 13:12:36.788627648 -0300
+@@ -4,18 +4,14 @@
+ 	
+ FLICKR_EXPORTERS = 		\
+ 	23hq			\
+-	flicker			\
+ 	$(NULL)	
+ 	
+ EXPORTERS = 			\
+ 	export_tools		\
+ 	burn_disc		\
+ 	contact_sheet		\
+-	facebook		\
+ 	flicker_utils		\
+ 	$(FLICKR_EXPORTERS)	\
+-	photobucket		\
+-	picasaweb		\
+ 	webalbums		\
+ 	$(NULL)
+ 	
+diff -Nur gthumb-3.2.7.orig/extensions/Makefile.in gthumb-3.2.7/extensions/Makefile.in
+--- gthumb-3.2.7.orig/extensions/Makefile.in	2014-03-25 17:22:57.000000000 -0300
++++ gthumb-3.2.7/extensions/Makefile.in	2014-04-19 13:12:49.175395986 -0300
+@@ -388,18 +388,14 @@
+ 
+ FLICKR_EXPORTERS = \
+ 	23hq			\
+-	flicker			\
+ 	$(NULL)	
+ 
+ EXPORTERS = \
+ 	export_tools		\
+ 	burn_disc		\
+ 	contact_sheet		\
+-	facebook		\
+ 	flicker_utils		\
+ 	$(FLICKR_EXPORTERS)	\
+-	photobucket		\
+-	picasaweb		\
+ 	webalbums		\
+ 	$(NULL)
+ 
+diff -Nur gthumb-3.2.7.orig/gthumb/gth-main.c gthumb-3.2.7/gthumb/gth-main.c
+--- gthumb-3.2.7.orig/gthumb/gth-main.c	2013-09-27 12:38:40.000000000 -0300
++++ gthumb-3.2.7/gthumb/gth-main.c	2014-04-19 12:54:27.448720074 -0300
+@@ -1185,11 +1185,9 @@
+ 						"desktop_background",
+ 						"edit_metadata",
+ 						"exiv2_tools",
+-						"facebook",
+ 						"file_manager",
+ 						"file_tools",
+ 						"find_duplicates",
+-						"flicker",
+ 						"gstreamer_tools",
+ 						"gstreamer_utils",
+ 						"image_print",
+@@ -1200,8 +1198,6 @@
+ 						"list_tools",
+ 						"oauth",
+ 						"photo_importer",
+-						"photobucket",
+-						"picasaweb",
+ 						"raw_files",
+ 						"red_eye_removal",
+ 						"rename_series",
+diff -Nur gthumb-3.2.7.orig/help/Makefile.am gthumb-3.2.7/help/Makefile.am
+--- gthumb-3.2.7.orig/help/Makefile.am	2013-04-30 13:56:13.000000000 -0300
++++ gthumb-3.2.7/help/Makefile.am	2014-04-19 13:18:40.744859012 -0300
+@@ -30,7 +30,6 @@
+ 	printing.page \
+ 	shortcuts.page \
+ 	sharing-disc.page \
+-	sharing-social.page \
+ 	wallpaper.page \
+ 	bookmarks.page \
+ 	import.page \
+diff -Nur gthumb-3.2.7.orig/help/Makefile.in gthumb-3.2.7/help/Makefile.in
+--- gthumb-3.2.7.orig/help/Makefile.in	2014-03-25 17:23:08.000000000 -0300
++++ gthumb-3.2.7/help/Makefile.in	2014-04-19 13:18:50.698270179 -0300
+@@ -351,7 +351,6 @@
+ 	printing.page \
+ 	shortcuts.page \
+ 	sharing-disc.page \
+-	sharing-social.page \
+ 	wallpaper.page \
+ 	bookmarks.page \
+ 	import.page \