summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-gfx/gtkam/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-gfx/gtkam/files')
-rw-r--r--media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch15
-rw-r--r--media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch86
2 files changed, 101 insertions, 0 deletions
diff --git a/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch b/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch
new file mode 100644
index 000000000000..ac0643f077b5
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.1.18-desktop-validation.patch
@@ -0,0 +1,15 @@
+--- gtkam.desktop.in~ 2011-05-26 09:57:43.000000000 +0200
++++ gtkam.desktop.in 2012-01-31 10:00:56.687216188 +0100
+@@ -1,11 +1,10 @@
+ [Desktop Entry]
+-Encoding=UTF-8
+ _Name=Gtkam Digital Camera Browser
+ _Comment=Browse and download images from an attached digital camera
+ Exec=gtkam
+ Icon=gtkam-camera
+ Terminal=false
+ Type=Application
+-Categories=GNOME;GTK;Photography;Graphics;RasterGraphics;Viewer;
++Categories=GNOME;GTK;Photography;Graphics;2DGraphics;RasterGraphics;Viewer;
+ StartupNotify=true
+ X-GNOME-DocPath=gtkam/gtkam.xml
diff --git a/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch b/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
new file mode 100644
index 000000000000..c1bacf0f24f2
--- /dev/null
+++ b/media-gfx/gtkam/files/gtkam-0.2.0-underlinking.patch
@@ -0,0 +1,86 @@
+diff -ur gtkam-0.2.0/configure.ac gtkam-0.2.0.new/configure.ac
+--- gtkam-0.2.0/configure.ac 2012-07-10 09:50:52.000000000 +0200
++++ gtkam-0.2.0.new/configure.ac 2013-12-28 17:10:16.899893905 +0100
+@@ -32,7 +32,6 @@
+ dnl Some programs we need
+ dnl ---------------------------------------------------------------------------
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_HEADER_STDC
+ AM_PROG_LIBTOOL
+ AC_PROG_INSTALL
+@@ -86,9 +85,7 @@
+ )
+ LIBS="$save_LIBS"
+
+-PKG_CHECK_MODULES([GTK], [gtk+-2.0])
+-AC_SUBST([GTK_CFLAGS])
+-AC_SUBST([GTK_LIBS])
++GP_CHECK_LIBRARY([GTK2], [gtk+-2.0])
+
+
+ dnl ---------------------------------------------------------------------------
+Sólo en gtkam-0.2.0.new/: configure.ac.orig
+diff -ur gtkam-0.2.0/src/Makefile.am gtkam-0.2.0.new/src/Makefile.am
+--- gtkam-0.2.0/src/Makefile.am 2009-10-10 11:10:26.000000000 +0200
++++ gtkam-0.2.0.new/src/Makefile.am 2013-12-28 17:10:13.118834763 +0100
+@@ -6,7 +6,7 @@
+ $(LIBEXIF_GTK_CFLAGS) \
+ $(LIBGPHOTO2_CFLAGS) \
+ $(GNOME_CFLAGS) \
+- $(GTK_CFLAGS) \
++ $(GTK2_CFLAGS) \
+ $(BONOBO_CFLAGS) \
+ $(GTKAM_GIMP_CFLAGS)
+
+@@ -46,14 +46,14 @@
+ gtkam-exif.c gtkam-exif.h \
+ gtkam-main.c gtkam-main.h \
+ i18n.h main.c
+-gtkam_LDADD = \
+- libgtkam.a \
+- $(LIBEXIF_LIBS) \
+- $(LIBEXIF_GTK_LIBS) \
++gtkam_LDADD = \
++ libgtkam.a \
++ $(LIBEXIF_LIBS) \
++ $(LIBEXIF_GTK_LIBS) \
+ $(LIBGPHOTO2_LIBS) \
+- $(GTKAM_LIBS) \
+- $(BONOBO_LIBS) \
+- $(GNOME_LIBS) \
++ $(GTK2_LIBS) \
++ $(BONOBO_LIBS) \
++ $(GNOME_LIBS) \
+ $(INTLLIBS)
+
+ if HAVE_GIMP
+@@ -69,6 +69,7 @@
+ $(LIBEXIF_LIBS) \
+ $(LIBEXIF_GTK_LIBS) \
+ $(LIBGPHOTO2_LIBS) \
++ $(GTK2_LIBS) \
+ $(BONOBO_LIBS) \
+ $(GNOME_LIBS) \
+ $(INTLLIBS)
+diff -ur gtkam-0.2.0/test/Makefile.am gtkam-0.2.0.new/test/Makefile.am
+--- gtkam-0.2.0/test/Makefile.am 2009-10-10 11:10:25.000000000 +0200
++++ gtkam-0.2.0.new/test/Makefile.am 2013-12-28 17:10:13.119834775 +0100
+@@ -4,7 +4,7 @@
+ $(LIBEXIF_GTK_CFLAGS) \
+ $(LIBGPHOTO2_CFLAGS) \
+ $(GNOME_CFLAGS) \
+- $(GTK_CFLAGS) \
++ $(GTK2_CFLAGS) \
+ $(BONOBO_CFLAGS) \
+ $(GTKAM_GIMP_CFLAGS)
+
+@@ -13,7 +13,7 @@
+ $(LIBEXIF_LIBS) \
+ $(LIBEXIF_GTK_LIBS) \
+ $(LIBGPHOTO2_LIBS) \
+- $(GTK_LIBS) \
++ $(GTK2_LIBS) \
+ $(BONOBO_LIBS) \
+ $(INTLLIBS)
+