Brian, Can you not provide a diff on a diff, please. I know I am guilty of that, still it would be extremely hard for people who are not familiar with the code to review them
-Ghee Brian Cameron wrote: > > After noticing that gtkam crashes when you try and run it in GNOME 2.17 > due to a deprecated D-Bus dependency, I found that there are new > releases of libgphoto, gphoto and gtkam that fix this problem. > > I'm in the middle of updating our spec-files to work with the new > versions. Lots of changes, and these fixes probably don't work yet > but I wanted to update the build with the work so far. > > Note that some of the patches are simply reworked. I think the updated > patches are more clear than the way they were organized previously. > Since many of the patches were due to Sun Studio compile problems, I > tried building without any patches and reapplied as needed. Doing > so I found that some of the patches are no longer needed. > > I also noticed that we weren't building many of the libgphoto drivers. > Now this is fixed and we are building all but sierra, which still does > not build with Sun Studio. > > Brian > > ------------------------------------------------------------------------ > > Index: gtkam.spec > =================================================================== > --- gtkam.spec (revision 10113) > +++ gtkam.spec (working copy) > @@ -13,23 +13,19 @@ > Name: gtkam > License: GPL > Group: Hardware/Other > -Version: 0.1.13 > -Release: 2 > +Version: 0.1.14 > +Release: 3 > Distribution: Java Desktop System > Vendor: Sun Microsystems, Inc. > Summary: A GTK Digital Camera Viewing Tool > -Source: > http://easynews.dl.sourceforge.net/sourceforge/gphoto/%{name}-%{version}.tar.gz > +Source: > http://easynews.dl.sourceforge.net/sourceforge/gphoto/%{name}-%{version}.tar.bz2 > Source1: > http://umn.dl.sourceforge.net/libexif/gexif-%{gexif_version}.tar.bz2 > # date:2003-08-15 type:branding owner:mattman > Patch1: gtkam-01-menu-entry.diff > -# date:2004-01-16 type:bug owner:mattman bugzilla:1616317 > -Patch2: gtkam-02-enable-deprecated.diff > # date:2004-02-04 type:bug owner:fujiwara bugster:4981813 bugzilla:1616397 > -Patch3: gtkam-03-g11n-i18n.diff > -# date:2004-06-02 type:bug owner:yippi bugzilla:1615872,1616320 > -Patch4: gtkam-04-solaris.diff > -# date:2006-12-12 owner:fujiwara bugster:6488200 bugzilla:1587858 > -Patch5: gtkam-05-g11n-i18n-menu.diff > +Patch2: gtkam-02-g11n-i18n.diff > +# date:2004-06-02 type:bug owner:yippi > +Patch3: gtkam-03-fixgexif.diff > URL: http://www.gphoto.org > BuildRoot: %{_tmppath}/%{name}-%{version}-build > Docdir: %{_datadir}/doc > @@ -53,8 +49,6 @@ > %patch1 -p1 > %patch2 -p1 > %patch3 -p1 > -%patch4 -p1 > -%patch5 -p1 > > %build > %ifos linux > @@ -124,6 +118,9 @@ > %{_mandir}/man1/* > > %changelog > +* Tue Dec 19 2006 - brian.cameron at sun.com > +- Bump to 0.1.14. Fix patches, removing upstream patches. > + > * Thu Dec 14 2006 - matt.keenan at sun.com > - Remove gtkam-05-short-cut-key.diff : not needed anymore > > Index: ChangeLog > =================================================================== > --- ChangeLog (revision 10113) > +++ ChangeLog (working copy) > @@ -1,3 +1,19 @@ > +2006-12-19 Brian Cameron <brian.cameron at sun.com> > + > + Note that this does not yet build properly. I am still working on > + this, but wanted to check in the work so far. Note these applications > + were broken previously since libgphoto was using a deprecated dbus > + dependency. > + * libgphoto.spec, gphoto.spec: Bump to 2.3.0. This is needed since > + the 2.2. versions depend on deprecated dbus interfaces. > + * patches/libgphoto2-03-fixstruct.diff, > + patches/libgphoto2-04-mars.diff, > + patches/libgphoto2-05-fixcameralist.diff: New patches to fix build. > + * libgphoto2-04-pragma-pack.diff, libgphoto2-05-dummy.diff: > + Removed old patches. > + * patches/gphoto2-01-build.diff: Fix patch for new version. > + * gtkam.spec: Bump to 0.1.14. Rework patches for new release. > + > 2006-12-20 Jeff Cai <jeff.cai at sun.com> > > * evolution-data-server.spec: Add bugzilla bug number. > Index: patches/libgphoto2-04-pragma-pack.diff > =================================================================== > --- patches/libgphoto2-04-pragma-pack.diff (revision 10113) > +++ patches/libgphoto2-04-pragma-pack.diff (working copy) > @@ -1,11 +0,0 @@ > -diff -urN libgphoto2-2.2.1/camlibs/ptp2/library.c > libgphoto2-2.2.1-hacked/camlibs/ptp2/library.c > ---- libgphoto2-2.2.1/camlibs/ptp2/library.c 2006-06-16 17:08:21.000000000 > +1200 > -+++ libgphoto2-2.2.1-hacked/camlibs/ptp2/library.c 2006-10-23 > 21:50:09.609424000 +1300 > -@@ -1715,6 +1715,7 @@ > - uint8_t name[8]; > - char unknown2[8]; > - }; > -+#pragma pack() > - > - #if 0 /* leave out ... is confusing -P downloads */ > - static int > Index: patches/libgphoto2-03-fixstruct.diff > =================================================================== > --- patches/libgphoto2-03-fixstruct.diff (revision 0) > +++ patches/libgphoto2-03-fixstruct.diff (revision 0) > @@ -0,0 +1,10 @@ > +--- libgphoto2-2.3.0/libgphoto2_port/ptpip/ptpip.c-orig 2006-12-19 > 17:20:03.907177000 -0600 > ++++ libgphoto2-2.3.0/libgphoto2_port/ptpip/ptpip.c 2006-12-19 > 17:20:13.296273000 -0600 > +@@ -63,6 +63,7 @@ > + #define CHECK(result) {int r=(result); if (r<0) return (r);} > + > + struct _GPPortPrivateLibrary { > ++int dummy; > + }; > + > + GPPortType > Index: patches/libgphoto2-05-dummy.diff > =================================================================== > --- patches/libgphoto2-05-dummy.diff (revision 10113) > +++ patches/libgphoto2-05-dummy.diff (working copy) > @@ -1,116 +0,0 @@ > -diff -urN libgphoto2-2.2.1/libgphoto2_port/ptpip/ptpip.c > libgphoto2-2.2.1-hacked/libgphoto2_port/ptpip/ptpip.c > ---- libgphoto2-2.2.1/libgphoto2_port/ptpip/ptpip.c 2006-04-19 > 13:54:26.000000000 +1200 > -+++ libgphoto2-2.2.1-hacked/libgphoto2_port/ptpip/ptpip.c 2006-10-23 > 21:51:51.633027000 +1300 > -@@ -63,6 +63,7 @@ > - #define CHECK(result) {int r=(result); if (r<0) return (r);} > - > - struct _GPPortPrivateLibrary { > -+int dummy; > - }; > - > - GPPortType > -diff -urN libgphoto2-2.2.1/packaging/generic/print-camera-list.c > libgphoto2-2.2.1-hacked/packaging/generic/print-camera-list.c > ---- libgphoto2-2.2.1/packaging/generic/print-camera-list.c 2006-04-19 > 13:54:05.000000000 +1200 > -+++ libgphoto2-2.2.1-hacked/packaging/generic/print-camera-list.c > 2006-10-23 21:51:51.634844000 +1300 > -@@ -614,54 +614,54 @@ > - > - /** list of supported output formats */ > - static const output_format_t formats[] = { > -- {name: "human-readable", > -- descr: "human readable list of cameras", > -- help: NULL, > -- paramdescr: NULL, > -- begin_func: human_begin_func, > -- camera_func: human_camera_func, > -- end_func: human_end_func > -- }, > -- {name: "usb-usermap", > -- descr: "usb.usermap include file for linux-hotplug", > -- help: "If no <scriptname> is given, uses the script name " > -+ {"human-readable", > -+ "human readable list of cameras", > -+ NULL, > -+ NULL, > -+ human_begin_func, > -+ human_camera_func, > -+ human_end_func > -+ }, > -+ {"usb-usermap", > -+ "usb.usermap include file for linux-hotplug", > -+ "If no <scriptname> is given, uses the script name " > - "\"" GP_USB_HOTPLUG_SCRIPT "\".\n Put this into > /etc/hotplug/usb/<scriptname>.usermap", > -- paramdescr: "<NAME_OF_HOTPLUG_SCRIPT>", > -- begin_func: empty_begin_func, > -- camera_func: hotplug_camera_func, > -- end_func: empty_end_func > -- }, > -- {name: "hal-fdi", > -- descr: "fdi file for HAL", > -- help: "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi", > -- paramdescr: NULL, > -- begin_func: fdi_begin_func, > -- camera_func: fdi_camera_func, > -- end_func: fdi_end_func > -- }, > -- {name: "hal-fdi-device", > -- descr: "fdi device file for HAL", > -- help: "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi", > -- paramdescr: NULL, > -- begin_func: fdi_device_begin_func, > -- camera_func: fdi_device_camera_func, > -- end_func: fdi_device_end_func > -- }, > -- {name: "udev-rules", > -- descr: "udev rules file", > -- help: "Put it into /etc/udev/libgphoto2.rules", > -- paramdescr: "<PATH_TO_HOTPLUG_SCRIPT>", > -- begin_func: udev_begin_func, > -- camera_func: udev_camera_func, > -- end_func: udev_end_func > -- }, > -- {name: "idlist", > -- descr: "list of IDs and names", > -- help: "grep for an ID to find the device name", > -- paramdescr: NULL, > -- begin_func: empty_begin_func, > -- camera_func: idlist_camera_func, > -- end_func: empty_end_func > -+ "<NAME_OF_HOTPLUG_SCRIPT>", > -+ empty_begin_func, > -+ hotplug_camera_func, > -+ empty_end_func > -+ }, > -+ {"hal-fdi", > -+ "fdi file for HAL", > -+ "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi", > -+ NULL, > -+ fdi_begin_func, > -+ fdi_camera_func, > -+ fdi_end_func > -+ }, > -+ {"hal-fdi-device", > -+ "fdi device file for HAL", > -+ "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi", > -+ NULL, > -+ fdi_device_begin_func, > -+ fdi_device_camera_func, > -+ fdi_device_end_func > -+ }, > -+ {"udev-rules", > -+ "udev rules file", > -+ "Put it into /etc/udev/libgphoto2.rules", > -+ "<PATH_TO_HOTPLUG_SCRIPT>", > -+ udev_begin_func, > -+ udev_camera_func, > -+ udev_end_func > -+ }, > -+ {"idlist", > -+ "list of IDs and names", > -+ "grep for an ID to find the device name", > -+ NULL, > -+ empty_begin_func, > -+ idlist_camera_func, > -+ empty_end_func > - }, > - {NULL, NULL, NULL, NULL, > - NULL, NULL, NULL} > Index: patches/gtkam-05-g11n-i18n-menu.diff > =================================================================== > --- patches/gtkam-05-g11n-i18n-menu.diff (revision 10113) > +++ patches/gtkam-05-g11n-i18n-menu.diff (working copy) > @@ -1,33 +0,0 @@ > -diff -urNp gtkam-0.1.13-orig/src/gtkam-main.c gtkam-0.1.13/src/gtkam-main.c > ---- gtkam-0.1.13-orig/src/gtkam-main.c 2006-12-12 16:26:29.573362000 > +0900 > -+++ gtkam-0.1.13/src/gtkam-main.c 2006-12-12 16:29:19.941861000 +0900 > -@@ -627,16 +627,6 @@ static const char *ui_description = > - " </toolbar>" > - "</ui>"; > - > --#ifdef ENABLE_NLS > -- > --static gchar * > --translate_func (const gchar *path, gpointer data) > --{ > -- return (_(path)); > --} > -- > --#endif > -- > - GtkWidget * > - gtkam_main_new (void) > - { > -@@ -661,9 +651,11 @@ gtkam_main_new (void) > - > - /* Menu */ > - action_group = gtk_action_group_new ("MenuActions"); > -+#ifdef GETTEXT_PACKAGE > -+ gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); > -+#endif > - gtk_action_group_add_actions (action_group, entries, G_N_ELEMENTS > (entries), m); > - gtk_action_group_add_toggle_actions (action_group, toggle_entries, > G_N_ELEMENTS (toggle_entries), m); > -- gtk_action_group_set_translate_func (action_group, translate_func, > NULL, NULL); > - > - ui_manager = gtk_ui_manager_new (); > - gtk_ui_manager_insert_action_group (ui_manager, action_group, 0); > Index: patches/libgphoto2-04-mars.diff > =================================================================== > --- patches/libgphoto2-04-mars.diff (revision 0) > +++ patches/libgphoto2-04-mars.diff (revision 0) > @@ -0,0 +1,47 @@ > +--- libgphoto2-2.3.0/camlibs/mars/mars.c-orig 2006-12-19 > 17:55:15.484218000 -0600 > ++++ libgphoto2-2.3.0/camlibs/mars/mars.c 2006-12-19 17:58:36.827514000 > -0600 > +@@ -38,7 +38,7 @@ > + #define GET_DATA 0x0f > + > + static int > +-M_READ (GPPort *port, char *data, int size) > ++M_PHOTOREAD (GPPort *port, char *data, int size) > + { > + gp_port_write(port, "\x21", 1); > + gp_port_read(port, data, 16); > +@@ -49,7 +49,7 @@ static int > + M_COMMAND (GPPort *port, char *command, int size, char *response) > + { > + gp_port_write(port, command, size); > +- M_READ(port, response, 16); > ++ M_PHOTOREAD(port, response, 16); > + return GP_OK; > + } > + > +@@ -68,7 +68,7 @@ mars_init (Camera *camera, GPPort *port, > + * camera reports 0x02 it is "jammed" and we must clear it. > + */ > + > +- M_READ(port, c, 16); > ++ M_PHOTOREAD(port, c, 16); > + if ( (c[0] == 0x02 ) ) { > + gp_port_write(port, "\x19", 1); > + gp_port_read(port, c, 16); > +@@ -317,7 +317,7 @@ mars_routine (Info *info, GPPort *port, > + memset(c,0,sizeof(c)); > + > + /*Routine used in initialization, photo download, and reset. */ > +- M_READ(port, c, 16); > ++ M_PHOTOREAD(port, c, 16); > + M_COMMAND(port, start, 2, c); > + M_COMMAND(port, do_something, 2, c); > + M_COMMAND(port, address1, 2, c); > +@@ -326,7 +326,7 @@ mars_routine (Info *info, GPPort *port, > + gp_port_write(port, address2, 2); > + /* Moving the memory cursor to the given address? */ > + while (( c[0] != 0xa) ) { > +- M_READ(port, c, 16); > ++ M_PHOTOREAD(port, c, 16); > + } > + > + M_COMMAND(port, address3, 2, c); > Index: patches/gtkam-01-menu-entry.diff > =================================================================== > --- patches/gtkam-01-menu-entry.diff (revision 10113) > +++ patches/gtkam-01-menu-entry.diff (working copy) > @@ -1,32 +1,37 @@ > ---- ../gtkam-0.1.11.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 > +0100 > -+++ ./gtkam.desktop.in 2005-03-22 12:05:37.763024976 +0000 > -@@ -0,0 +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.png > -+Terminal=false > -+Type=Application > -+Categories=Application;Graphics; > -+StartupNotify=true > ---- gtkam-0.1.13/Makefile.am.orig 2006-01-03 14:30:43.745457000 +0000 > -+++ gtkam-0.1.13/Makefile.am 2006-01-03 14:32:49.091620000 +0000 > -@@ -19,8 +19,20 @@ > +--- gtkam-0.1.14/configure.ac-orig 2006-12-19 22:09:30.578487000 -0600 > ++++ gtkam-0.1.14/configure.ac 2006-12-19 22:10:08.178960000 -0600 > +@@ -37,6 +37,9 @@ AC_HEADER_STDC > + AM_PROG_LIBTOOL > + AC_PROG_INSTALL > + GP_PKG_CONFIG > ++AC_PROG_INTLTOOL > ++AC_PROG_LIBTOOL > ++AC_SUBST(POMAKEFILEDEPS) > + > + GP_CONFIG_MSG([Compiler],[${CC}]) > + AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using]) > +--- gtkam-0.1.14/Makefile.am-orig 2006-12-19 22:10:30.307270000 -0600 > ++++ gtkam-0.1.14/Makefile.am 2006-12-19 22:14:28.557427000 -0600 > +@@ -15,14 +15,23 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-sc > + gtkamdocdir = $(datadir)/doc/gtkam > + gtkamdoc_DATA = AUTHORS COPYING NEWS README TODO CHANGES > + > +-desktopdir = $(datadir)/applications > +-desktop_DATA = gtkam.desktop > +- > icondir = $(datadir)/pixmaps > icon_DATA = gtkam.png > > --EXTRA_DIST = gtkam.desktop gtkam.png > +-EXTRA_DIST = gtkam.desktop gtkam.png AUTHORS COPYING NEWS README TODO > CHANGES > + at INTLTOOL_DESKTOP_RULE@ > - > ++ > +DESKTOP_IN_FILES=gtkam.desktop.in > +DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) > + > +Applicationsdir = $(datadir)/applications > +Applications_DATA = $(DESKTOP_FILES) > -+ > -+EXTRA_DIST = \ > + > ++EXTRA_DIST = gtkam.png AUTHORS COPYING NEWS README TODO CHANGES \ > + intltool-extract.in \ > + intltool-merge.in \ > + intltool-update.in \ > @@ -35,9 +40,9 @@ > > ######################################################################## > # Packaging convenience > ---- ../gtkam-0.1.11.old/art/Makefile.am 2005-03-22 12:05:17.845052968 > +0000 > -+++ ./art/Makefile.am 2005-03-22 12:05:37.764024824 +0000 > -@@ -7,4 +7,9 @@ > +--- gtkam-0.1.14/art/Makefile.am-orig 2006-12-19 22:13:21.501557000 > -0600 > ++++ gtkam-0.1.14/art/Makefile.am 2006-12-19 22:14:08.921735000 -0600 > +@@ -7,4 +7,9 @@ images_DATA = \ > gtkam-lock.png \ > gtkam-new.png > > @@ -45,18 +50,19 @@ > +icondir = $(datadir)/pixmaps > +icon_DATA = gtkam-camera.png > +EXTRA_DIST = \ > -+ $(images_DATA) \ > -+ $(icon_DATA) > ++ $(images_DATA) \ > ++ $(icon_DATA) > + > ---- gtkam-0.1.13/configure.in.orig 2006-01-03 14:24:21.108558000 +0000 > -+++ gtkam-0.1.13/configure.in 2006-01-03 14:28:19.556829000 +0000 > -@@ -37,6 +37,9 @@ > - AM_PROG_LIBTOOL > - AC_PROG_INSTALL > - GP_PKG_CONFIG > -+AC_PROG_INTLTOOL > -+AC_PROG_LIBTOOL > -+AC_SUBST(POMAKEFILEDEPS) > - > - GP_CONFIG_MSG([Compiler],[${CC}]) > - AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using]) > +--- ../gtkam-0.1.11.old/gtkam.desktop.in 1970-01-01 01:00:00.000000000 > +0100 > ++++ ./gtkam.desktop.in 2005-03-22 12:05:37.763024976 +0000 > +@@ -0,0 +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.png > ++Terminal=false > ++Type=Application > ++Categories=Application;Graphics; > ++StartupNotify=true > Index: patches/gtkam-03-g11n-i18n.diff > =================================================================== > --- patches/gtkam-03-g11n-i18n.diff (revision 10113) > +++ patches/gtkam-03-g11n-i18n.diff (working copy) > @@ -1,171 +0,0 @@ > ---- gtkam-0.1.13/configure.in.orig 2006-01-03 14:24:21.108558000 +0000 > -+++ gtkam-0.1.13/configure.in 2006-01-03 14:40:33.621499000 +0000 > -@@ -57,10 +60,15 @@ > - dnl > --------------------------------------------------------------------------- > - dnl i18n support > - dnl > --------------------------------------------------------------------------- > -+GETTEXT_PACKAGE=gtkam > -+AC_SUBST(GETTEXT_PACKAGE) > - GP_GETTEXT_HACK([],[Lutz M??ller and others],[${MAIL_GPHOTO_TRANSLATION}]) > - ALL_LINGUAS="cs da de es fr hu it ja nb pl pt_BR pt_PT ru sl sv uk" > --AM_GNU_GETTEXT_VERSION([0.14.1]) > --AM_GNU_GETTEXT([external]) > -+AM_GLIB_GNU_GETTEXT > -+USE_INCLUDED_LIBINTL=no > -+AC_SUBST(USE_INCLUDED_LIBINTL) > -+BUILD_INCLUDED_LIBINTL=no > -+AC_SUBST(BUILD_INCLUDED_LIBINTL) > - AM_PO_SUBDIRS() > - AM_ICONV() > - GP_GETTEXT_FLAGS() > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am > gtkam-0.1.11/gexif-0.5/Makefile.am > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/Makefile.am 2004-06-17 12:11:30.000000000 > -0700 > -@@ -1,5 +1,10 @@ > -+NULL = > - SUBDIRS = intl m4 libjpeg gexif po > - > - ACLOCAL_AMFLAGS = -I m4 > - > --EXTRA_DIST = config.rpath mkinstalldirs > -+EXTRA_DIST = config.rpath mkinstalldirs \ > -+ intltool-extract.in \ > -+ intltool-merge.in \ > -+ intltool-update.in \ > -+ $(NULL) > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in > gtkam-0.1.11/gexif-0.5/configure.in > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/configure.in 2004-06-17 12:11:34.000000000 > -0700 > -@@ -9,8 +9,15 @@ > - dnl > --------------------------------------------------------------------------- > - dnl i18n support > - dnl > --------------------------------------------------------------------------- > -+GETTEXT_PACKAGE=gexif > -+AC_SUBST(GETTEXT_PACKAGE) > -+AC_PROG_INTLTOOL > - ALL_LINGUAS="de es fr" > --AM_GNU_GETTEXT > -+AM_GLIB_GNU_GETTEXT > -+USE_INCLUDED_LIBINTL=no > -+AC_SUBST(USE_INCLUDED_LIBINTL) > -+BUILD_INCLUDED_LIBINTL=no > -+AC_SUBST(BUILD_INCLUDED_LIBINTL) > - > - dnl > --------------------------------------------------------------------------- > - dnl libexif > -@@ -26,7 +33,13 @@ > - AC_SUBST(GEXIF_LIBS) > - AC_SUBST(GEXIF_CFLAGS) > - > --CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > -+dnl Only use -Wall if we have gcc > -+if test "x$GCC" = "xyes"; then > -+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then > -+ CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > -+ fi > -+fi > -+ > - AC_SUBST(CFLAGS) > - > - AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c > gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:30.000000000 -0700 > -@@ -281,7 +281,7 @@ > - action_about (gpointer callback_data, guint callback_action, > - GtkWidget *widget) > - { > -- g_warning ("Implement!"); > -+ g_warning (_("Implement!")); > - } > - > - static void > -@@ -303,19 +303,25 @@ > - > - static GtkItemFactoryEntry mi[] = > - { > -- {"/_File", NULL, 0, 0, "<Branch>"}, > -- {"/File/_Open...", NULL, action_open, 0, "<StockItem>", GTK_STOCK_OPEN}, > -- {"/File/_Save", NULL, action_save, 0, "<StockItem>", GTK_STOCK_SAVE}, > -- {"/File/Save _As...", NULL, action_save_as, 0, "<StockItem>", > -+ {N_("/_File"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/File/_Open..."), NULL, action_open, 0, "<StockItem>", > GTK_STOCK_OPEN}, > -+ {N_("/File/_Save"), NULL, action_save, 0, "<StockItem>", > GTK_STOCK_SAVE}, > -+ {N_("/File/Save _As..."), NULL, action_save_as, 0, "<StockItem>", > - GTK_STOCK_SAVE_AS}, > -- {"/File/sep1", NULL, 0, 0, "<Separator>"}, > -- {"/File/E_xit", NULL, action_exit, 0, "<StockItem>", GTK_STOCK_QUIT}, > -- {"/_View", NULL, 0, 0, "<Branch>"}, > -- {"/View/_Thumbnail", NULL, action_thumbnail, 0, NULL, NULL}, > -- {"/_Help", NULL, 0, 0, "<Branch>"}, > -- {"/Help/About", NULL, action_about, 0, NULL, NULL} > -+ {N_("/File/sep1"), NULL, 0, 0, "<Separator>"}, > -+ {N_("/File/E_xit"), NULL, action_exit, 0, "<StockItem>", > GTK_STOCK_QUIT}, > -+ {N_("/_View"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/View/_Thumbnail"), NULL, action_thumbnail, 0, NULL, NULL}, > -+ {N_("/_Help"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/Help/About"), NULL, action_about, 0, NULL, NULL} > - }; > - > -+static gchar * > -+translate_func (const gchar *path, gpointer data) > -+{ > -+ return g_strdup (_(path)); > -+} > -+ > - GtkWidget * > - gexif_main_new (void) > - { > -@@ -337,6 +343,10 @@ > - ag = gtk_accel_group_new (); > - gtk_window_add_accel_group (GTK_WINDOW (m), ag); > - gif = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", ag); > -+#ifdef ENABLE_NLS > -+ gtk_item_factory_set_translate_func (GTK_ITEM_FACTORY (gif), > -+ translate_func, NULL, NULL); > -+#endif > - g_object_set_data_full (G_OBJECT (m), "<main>", gif, > - (GDestroyNotify) g_object_unref); > - gtk_item_factory_create_items (gif, G_N_ELEMENTS (mi), mi, m); > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c > gtkam-0.1.11/gexif-0.5/gexif/gexif.c > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/gexif/gexif.c 2004-06-17 12:11:30.000000000 > -0700 > -@@ -50,6 +50,7 @@ > - > - gtk_set_locale (); > - bindtextdomain (PACKAGE, GEXIF_LOCALEDIR); > -+ bind_textdomain_codeset (PACKAGE, "UTF-8"); > - textdomain (PACKAGE); > - > - gtk_init (&argc, &argv); > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in > gtkam-0.1.11/gexif-0.5/po/POTFILES.in > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/po/POTFILES.in 2004-06-17 12:11:30.000000000 > -0700 > -@@ -1 +1,2 @@ > - gexif/gexif-main.c > -+gexif/gexif-thumbnail.c > -diff -ur gtkam-0.1.11.after-patch-2/po/POTFILES.in > gtkam-0.1.11/po/POTFILES.in > ---- gtkam-0.1.11.after-patch-2/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/po/POTFILES.in 2004-06-17 12:11:18.000000000 -0700 > -@@ -1,3 +1,4 @@ > -+gtkam.desktop.in > - src/gtkam-cancel.c > - src/gtkam-chooser.c > - src/gtkam-close.c > -diff -ur gtkam-0.1.11.after-patch-2/src/gtkam-tree.c > gtkam-0.1.11/src/gtkam-tree.c > ---- gtkam-0.1.11.after-patch-2/src/gtkam-tree.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/src/gtkam-tree.c 2004-06-17 12:11:18.000000000 -0700 > -@@ -1143,9 +1143,10 @@ > - strcmp (model, "Directory Browse")) { > - p = gp_port_info_list_lookup_path (il, port); > - if (p < 0) { > -- g_warning ("Could not find '%s' in port " > -- "info list (%s)!", port, > -- gp_result_as_string (p)); > -+ g_warning (_("Could not find '%s' in port " > -+ "info list (%s)!"), > -+ g_locale_to_utf8 (port, -1, NULL, NULL, > NULL), > -+ g_locale_to_utf8 (gp_result_as_string > (p), -1, NULL, NULL, NULL)); > - gp_camera_unref (camera); > - continue; > - } > Index: patches/gtkam-02-g11n-i18n.diff > =================================================================== > --- patches/gtkam-02-g11n-i18n.diff (revision 10113) > +++ patches/gtkam-02-g11n-i18n.diff (working copy) > @@ -1,6 +1,6 @@ > ---- gtkam-0.1.13/configure.in.orig 2006-01-03 14:24:21.108558000 +0000 > -+++ gtkam-0.1.13/configure.in 2006-01-03 14:40:33.621499000 +0000 > -@@ -57,10 +60,15 @@ > +--- gtkam-0.1.14/configure.ac-orig 2006-12-19 16:49:28.336642000 -0600 > ++++ gtkam-0.1.14/configure.ac 2006-12-19 16:52:25.753012000 -0600 > +@@ -57,10 +57,15 @@ GP_REFERENCES()dnl > dnl > --------------------------------------------------------------------------- > dnl i18n support > dnl > --------------------------------------------------------------------------- > @@ -18,154 +18,3 @@ > AM_PO_SUBDIRS() > AM_ICONV() > GP_GETTEXT_FLAGS() > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am > gtkam-0.1.11/gexif-0.5/Makefile.am > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/Makefile.am 2004-06-17 12:11:30.000000000 > -0700 > -@@ -1,5 +1,10 @@ > -+NULL = > - SUBDIRS = intl m4 libjpeg gexif po > - > - ACLOCAL_AMFLAGS = -I m4 > - > --EXTRA_DIST = config.rpath mkinstalldirs > -+EXTRA_DIST = config.rpath mkinstalldirs \ > -+ intltool-extract.in \ > -+ intltool-merge.in \ > -+ intltool-update.in \ > -+ $(NULL) > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in > gtkam-0.1.11/gexif-0.5/configure.in > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/configure.in 2004-06-17 12:11:34.000000000 > -0700 > -@@ -9,8 +9,15 @@ > - dnl > --------------------------------------------------------------------------- > - dnl i18n support > - dnl > --------------------------------------------------------------------------- > -+GETTEXT_PACKAGE=gexif > -+AC_SUBST(GETTEXT_PACKAGE) > -+AC_PROG_INTLTOOL > - ALL_LINGUAS="de es fr" > --AM_GNU_GETTEXT > -+AM_GLIB_GNU_GETTEXT > -+USE_INCLUDED_LIBINTL=no > -+AC_SUBST(USE_INCLUDED_LIBINTL) > -+BUILD_INCLUDED_LIBINTL=no > -+AC_SUBST(BUILD_INCLUDED_LIBINTL) > - > - dnl > --------------------------------------------------------------------------- > - dnl libexif > -@@ -26,7 +33,13 @@ > - AC_SUBST(GEXIF_LIBS) > - AC_SUBST(GEXIF_CFLAGS) > - > --CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > -+dnl Only use -Wall if we have gcc > -+if test "x$GCC" = "xyes"; then > -+ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then > -+ CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > -+ fi > -+fi > -+ > - AC_SUBST(CFLAGS) > - > - AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c > gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:30.000000000 -0700 > -@@ -281,7 +281,7 @@ > - action_about (gpointer callback_data, guint callback_action, > - GtkWidget *widget) > - { > -- g_warning ("Implement!"); > -+ g_warning (_("Implement!")); > - } > - > - static void > -@@ -303,19 +303,25 @@ > - > - static GtkItemFactoryEntry mi[] = > - { > -- {"/_File", NULL, 0, 0, "<Branch>"}, > -- {"/File/_Open...", NULL, action_open, 0, "<StockItem>", GTK_STOCK_OPEN}, > -- {"/File/_Save", NULL, action_save, 0, "<StockItem>", GTK_STOCK_SAVE}, > -- {"/File/Save _As...", NULL, action_save_as, 0, "<StockItem>", > -+ {N_("/_File"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/File/_Open..."), NULL, action_open, 0, "<StockItem>", > GTK_STOCK_OPEN}, > -+ {N_("/File/_Save"), NULL, action_save, 0, "<StockItem>", > GTK_STOCK_SAVE}, > -+ {N_("/File/Save _As..."), NULL, action_save_as, 0, "<StockItem>", > - GTK_STOCK_SAVE_AS}, > -- {"/File/sep1", NULL, 0, 0, "<Separator>"}, > -- {"/File/E_xit", NULL, action_exit, 0, "<StockItem>", GTK_STOCK_QUIT}, > -- {"/_View", NULL, 0, 0, "<Branch>"}, > -- {"/View/_Thumbnail", NULL, action_thumbnail, 0, NULL, NULL}, > -- {"/_Help", NULL, 0, 0, "<Branch>"}, > -- {"/Help/About", NULL, action_about, 0, NULL, NULL} > -+ {N_("/File/sep1"), NULL, 0, 0, "<Separator>"}, > -+ {N_("/File/E_xit"), NULL, action_exit, 0, "<StockItem>", > GTK_STOCK_QUIT}, > -+ {N_("/_View"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/View/_Thumbnail"), NULL, action_thumbnail, 0, NULL, NULL}, > -+ {N_("/_Help"), NULL, 0, 0, "<Branch>"}, > -+ {N_("/Help/About"), NULL, action_about, 0, NULL, NULL} > - }; > - > -+static gchar * > -+translate_func (const gchar *path, gpointer data) > -+{ > -+ return g_strdup (_(path)); > -+} > -+ > - GtkWidget * > - gexif_main_new (void) > - { > -@@ -337,6 +343,10 @@ > - ag = gtk_accel_group_new (); > - gtk_window_add_accel_group (GTK_WINDOW (m), ag); > - gif = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", ag); > -+#ifdef ENABLE_NLS > -+ gtk_item_factory_set_translate_func (GTK_ITEM_FACTORY (gif), > -+ translate_func, NULL, NULL); > -+#endif > - g_object_set_data_full (G_OBJECT (m), "<main>", gif, > - (GDestroyNotify) g_object_unref); > - gtk_item_factory_create_items (gif, G_N_ELEMENTS (mi), mi, m); > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c > gtkam-0.1.11/gexif-0.5/gexif/gexif.c > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/gexif/gexif.c 2004-06-17 12:11:30.000000000 > -0700 > -@@ -50,6 +50,7 @@ > - > - gtk_set_locale (); > - bindtextdomain (PACKAGE, GEXIF_LOCALEDIR); > -+ bind_textdomain_codeset (PACKAGE, "UTF-8"); > - textdomain (PACKAGE); > - > - gtk_init (&argc, &argv); > -diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in > gtkam-0.1.11/gexif-0.5/po/POTFILES.in > ---- gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/gexif-0.5/po/POTFILES.in 2004-06-17 12:11:30.000000000 > -0700 > -@@ -1 +1,2 @@ > - gexif/gexif-main.c > -+gexif/gexif-thumbnail.c > -diff -ur gtkam-0.1.11.after-patch-2/po/POTFILES.in > gtkam-0.1.11/po/POTFILES.in > ---- gtkam-0.1.11.after-patch-2/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/po/POTFILES.in 2004-06-17 12:11:18.000000000 -0700 > -@@ -1,3 +1,4 @@ > -+gtkam.desktop.in > - src/gtkam-cancel.c > - src/gtkam-chooser.c > - src/gtkam-close.c > -diff -ur gtkam-0.1.11.after-patch-2/src/gtkam-tree.c > gtkam-0.1.11/src/gtkam-tree.c > ---- gtkam-0.1.11.after-patch-2/src/gtkam-tree.c 2004-06-17 > 12:11:03.000000000 -0700 > -+++ gtkam-0.1.11/src/gtkam-tree.c 2004-06-17 12:11:18.000000000 -0700 > -@@ -1143,9 +1143,10 @@ > - strcmp (model, "Directory Browse")) { > - p = gp_port_info_list_lookup_path (il, port); > - if (p < 0) { > -- g_warning ("Could not find '%s' in port " > -- "info list (%s)!", port, > -- gp_result_as_string (p)); > -+ g_warning (_("Could not find '%s' in port " > -+ "info list (%s)!"), > -+ g_locale_to_utf8 (port, -1, NULL, NULL, > NULL), > -+ g_locale_to_utf8 (gp_result_as_string > (p), -1, NULL, NULL, NULL)); > - gp_camera_unref (camera); > - continue; > - } > Index: patches/gtkam-02-enable-deprecated.diff > =================================================================== > --- patches/gtkam-02-enable-deprecated.diff (revision 10113) > +++ patches/gtkam-02-enable-deprecated.diff (working copy) > @@ -1,10 +0,0 @@ > ---- ../gtkam-0.1.12.old/gexif-0.5/gexif/Makefile.am 2005-06-15 > 11:01:00.205345848 +0100 > -+++ ./gexif-0.5/gexif/Makefile.am 2005-06-15 11:01:16.519865664 +0100 > -@@ -1,7 +1,6 @@ > - INCLUDES = \ > - -I$(top_srcdir) \ > - -I$(top_srcdir)/intl \ > -- -DGTK_DISABLE_DEPRECATED \ > - -DGEXIF_LOCALEDIR="\"$(datadir)/locale\"" \ > - $(GEXIF_CFLAGS) > - > Index: patches/libgphoto2-02-uninstalled-pc.diff > =================================================================== > --- patches/libgphoto2-02-uninstalled-pc.diff (revision 10113) > +++ patches/libgphoto2-02-uninstalled-pc.diff (working copy) > @@ -1,17 +1,27 @@ > ---- /dev/null Wed Apr 14 16:59:38 2004 > -+++ libgphoto2-2.1.4/libgphoto2/libgphoto2-uninstalled.pc Wed Apr 14 > 17:01:17 2004 > -@@ -0,0 +1,13 @@ > -+prefix= > -+exec_prefix= > -+libdir=${pcfiledir} > +--- libgphoto2-2.3.0/configure.ac-in 2006-12-19 20:36:39.559052000 -0600 > ++++ libgphoto2-2.3.0/configure.ac 2006-12-19 20:36:50.797929000 -0600 > +@@ -607,6 +607,7 @@ camlibs/toshiba/pdrm11/Makefile > + camlibs/enigma13/Makefile > + libgphoto2/Makefile > + libgphoto2/libgphoto2.pc > ++libgphoto2/libgphoto2-uninstalled.pc > + tests/Makefile > + tests/check-camera-list.sh > + tests/ddb/Makefile > +--- /dev/null 2006-12-19 20:33:17.000000000 -0600 > ++++ libgphoto2-2.3.0/libgphoto2/libgphoto2-uninstalled.pc.in 2006-12-19 > 20:36:27.361449000 -0600 > +@@ -0,0 +1,14 @@ > ++pref...@prefix@ > ++exec_pref...@exec_prefix@ > ++libd...@libdir@ > +includedir=${pc_top_builddir}/${pcfiledir} > -+VERSION=2.2.1 > -+driverdir=${libdir}/gphoto2/${VERSION} > ++versi...@version@ > ++driverd...@camlibdir@ > + > +Name: libgphoto2 > +Description: Library for easy access to digital cameras > -+Requires: > -+Version: 2.2.1 > ++URL: http://gphoto.org/proj/libgphoto2/ > ++Version: @VERSION@ > ++Requires: @REQUIREMENTS_FOR_LIBEXIF@ > +Libs: ${pc_top_builddir}/${pcfiledir}/libgphoto2.la -lm > -+Cflags: -I${includedir} -I${includedir}/../libgphoto2_port > -I${includedir}/../libgphoto2_port/libgphoto2_port > - > ++Cflags: -I${includedir} -I${includedir}/.. > -I${includedir}/../libgphoto2_port > Index: patches/gtkam-04-solaris.diff > =================================================================== > --- patches/gtkam-04-solaris.diff (revision 10113) > +++ patches/gtkam-04-solaris.diff (working copy) > @@ -1,40 +0,0 @@ > ---- gtkam-0.1.11/src/gtkam-close.c-orig Thu May 27 14:44:21 2004 > -+++ gtkam-0.1.11/src/gtkam-close.c Thu May 27 14:44:29 2004 > -@@ -33,6 +33,7 @@ > - > - struct _GtkamClosePrivate > - { > -+ int notused; > - }; > - > - #define PARENT_TYPE GTKAM_TYPE_DIALOG > ---- gtkam-0.1.11/src/gtkam-context.c-orig Thu May 27 14:44:43 2004 > -+++ gtkam-0.1.11/src/gtkam-context.c Thu May 27 14:44:50 2004 > -@@ -36,6 +36,7 @@ > - static GObjectClass *parent_class; > - > - struct _GtkamContextPrivate { > -+ int notused; > - }; > - > - static void > ---- gtkam-0.1.11/src/gtkam-exif.c-orig Thu May 27 14:45:08 2004 > -+++ gtkam-0.1.11/src/gtkam-exif.c Thu May 27 14:45:13 2004 > -@@ -39,6 +39,7 @@ > - > - struct _GtkamExifPrivate > - { > -+ int notused; > - }; > - > - #define PARENT_TYPE GTK_TYPE_DIALOG > ---- gtkam-0.1.11/gexif-0.5/gexif/gexif-thumbnail.c-orig 2004-05-28 > 12:38:35.947943000 -0500 > -+++ gtkam-0.1.11/gexif-0.5/gexif/gexif-thumbnail.c 2004-05-28 > 12:38:42.792627000 -0500 > -@@ -54,6 +54,7 @@ > - > - struct _GExifThumbnailPrivate > - { > -+ int notused; > - }; > - > - #define PARENT_TYPE GTK_TYPE_DIALOG > Index: patches/libgphoto2-06-fixlimits.diff > =================================================================== > --- patches/libgphoto2-06-fixlimits.diff (revision 0) > +++ patches/libgphoto2-06-fixlimits.diff (revision 0) > @@ -0,0 +1,11 @@ > +--- libgphoto2-2.3.0/configure.ac-orig 2006-12-19 22:03:57.641367000 > -0600 > ++++ libgphoto2-2.3.0/configure.ac 2006-12-19 22:04:23.799900000 -0600 > +@@ -246,7 +246,7 @@ AC_HEADER_DIRENT > + # before _HEADER_STDC > + AC_HEADER_STDC > + # after _HEADER_STDC > +-AC_CHECK_HEADERS(getopt.h unistd.h mcheck.h) > ++AC_CHECK_HEADERS(getopt.h unistd.h mcheck.h limits.h) > + AC_C_INLINE([]) > + AC_C_CONST([]) > + dnl FIXME: AC_STRUCT_TIMEZONE > Index: patches/gphoto2-01-build.diff > =================================================================== > --- patches/gphoto2-01-build.diff (revision 10113) > +++ patches/gphoto2-01-build.diff (working copy) > @@ -1,6 +1,6 @@ > ---- gphoto2-2.1.99/configure.ac.orig 2006-01-03 13:43:00.499798000 +0000 > -+++ gphoto2-2.1.99/configure.ac 2006-01-03 13:45:49.216888000 +0000 > -@@ -60,8 +60,14 @@ > +--- gphoto2-2.1.6/configure-ac.orig 2006-12-19 19:43:00.093701000 -0600 > ++++ gphoto2-2.1.6/configure.ac 2006-12-19 19:43:08.193920000 -0600 > +@@ -63,11 +63,16 @@ dnl i18n support > dnl > --------------------------------------------------------------------------- > GP_GETTEXT_HACK([],[Lutz M??ller and others],[${MAIL_GPHOTO_TRANSLATION}]) > ALL_LINGUAS="az cs da de en_GB es eu fi fr hu it ja nb nl pa pl pt_BR ro ru > rw sk sl sr sv uk vi zh_CN zh_TW" > @@ -16,59 +16,10 @@ > +AC_SUBST(BUILD_INCLUDED_LIBINTL) > AM_PO_SUBDIRS() > AM_ICONV() > - GP_GETTEXT_FLAGS() > ---- gphoto2-2.1.99/gphoto2/main.c.orig 2006-01-03 13:48:08.468859000 > +0000 > -+++ gphoto2-2.1.99/gphoto2/main.c 2006-01-03 13:52:06.902248000 +0000 > -@@ -17,6 +17,14 @@ > - * Boston, MA 02111-1307, USA. > - */ > +-GP_GETTEXT_FLAGS() > > -+#include <stdlib.h> > -+#include <stdio.h> > -+#include <stdarg.h> > -+#include <string.h> > -+#include <unistd.h> > -+#include <ctype.h> > -+#include <locale.h> > -+ > - #include "config.h" > - #include "actions.h" > - #include "foreach.h" > -@@ -34,14 +42,6 @@ > - # include "gphoto2-cmd-config.h" > - #endif > - > --#include <stdlib.h> > --#include <stdio.h> > --#include <stdarg.h> > --#include <string.h> > --#include <unistd.h> > --#include <ctype.h> > --#include <locale.h> > -- > - #ifdef HAVE_POPT > - # include <popt.h> > - /* POPT_TABLEEND is only defined from popt 1.6.1 */ > -@@ -1685,7 +1685,7 @@ > - #ifdef HAVE_POPT > - CallbackParams params; > - poptContext ctx; > -- const struct poptOption options[] = { > -+ struct poptOption options[] = { > - POPT_AUTOHELP > - {NULL, '\0', POPT_ARG_CALLBACK, > - (void *) &cb_arg, 0, (char *) ¶ms, NULL}, > ---- gphoto2-2.1.99/gphoto2/Makefile.am.orig 2006-01-03 13:53:55.167957000 > +0000 > -+++ gphoto2-2.1.99/gphoto2/Makefile.am 2006-01-03 13:56:19.035176000 > +0000 > -@@ -9,6 +9,8 @@ > - > - bin_PROGRAMS = gphoto2 > - > -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) > $(LDFLAGS) -o $@ > -+ > - if HAVE_CDK > - CDK_FILES = gphoto2-cmd-config.c gphoto2-cmd-config.h > - else > + dnl We cannot use AC_DEFINE_UNQUOTED() for these definitions, as > + dnl we require make to do insert the proper $(datadir) value > --- gphoto2-2.1.6/gphoto2/actions.c.orig 2005-09-30 19:23:13.205326000 > +0100 > +++ gphoto2-2.1.6/gphoto2/actions.c 2005-09-30 19:23:34.641635000 +0100 > @@ -20,6 +20,7 @@ > Index: patches/libgphoto2-05-fixcameralist.diff > =================================================================== > --- patches/libgphoto2-05-fixcameralist.diff (revision 0) > +++ patches/libgphoto2-05-fixcameralist.diff (revision 0) > @@ -0,0 +1,136 @@ > +--- libgphoto2-2.3.0/packaging/generic/print-camera-list.c-orig > 2006-12-19 18:58:46.242708000 -0600 > ++++ libgphoto2-2.3.0/packaging/generic/print-camera-list.c 2006-12-19 > 19:14:47.608075000 -0600 > +@@ -987,70 +987,70 @@ iterate_camera_list (const int add_comme > + > + /** list of supported output formats */ > + static const output_format_t formats[] = { > +- {name: "human-readable", > +- descr: "human readable list of cameras", > +- help: NULL, > +- paramdescr: NULL, > +- begin_func: human_begin_func, > +- camera_func: human_camera_func, > +- end_func: human_end_func > +- }, > +- {name: "usb-usermap", > +- descr: "usb.usermap include file for linux-hotplug", > +- help: "If no <scriptname> is given, uses the script name " > ++ {"human-readable", > ++ "human readable list of cameras", > ++ NULL, > ++ NULL, > ++ human_begin_func, > ++ human_camera_func, > ++ human_end_func > ++ }, > ++ {"usb-usermap", > ++ "usb.usermap include file for linux-hotplug", > ++ "If no <scriptname> is given, uses the script name " > + "\"" GP_USB_HOTPLUG_SCRIPT "\".\n Put this into > /etc/hotplug/usb/<scriptname>.usermap", > +- paramdescr: "<NAME_OF_HOTPLUG_SCRIPT>", > +- begin_func: empty_begin_func, > +- camera_func: hotplug_camera_func, > +- end_func: empty_end_func > +- }, > +- {name: "hal-fdi", > +- descr: "fdi file for HAL", > +- help: "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi", > +- paramdescr: NULL, > +- begin_func: fdi_begin_func, > +- camera_func: fdi_camera_func, > +- end_func: fdi_end_func > +- }, > +- {name: "hal-fdi-device", > +- descr: "fdi device file for HAL", > +- help: "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi", > +- paramdescr: NULL, > +- begin_func: fdi_device_begin_func, > +- camera_func: fdi_device_camera_func, > +- end_func: fdi_device_end_func > +- }, > +- {name: "udev-rules", > +- descr: "udev < 0.98 rules file", > +- help: "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, > group or add script to run", > +- paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group > <group>]* ) ", > +- begin_func: udev_begin_func, > +- camera_func: udev_camera_func, > +- end_func: udev_end_func > +- }, > +- {name: "udev-rules-0.98", > +- descr: "udev >= 0.98 rules file", > +- help: "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, > group or add script to run, for udev >= 0.98", > +- paramdescr: "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group > <group>]* ) ", > +- begin_func: udev_098_begin_func, > +- camera_func: udev_098_camera_func, > +- end_func: udev_end_func > +- }, > +- {name: "idlist", > +- descr: "list of IDs and names", > +- help: "grep for an ID to find the device name", > +- paramdescr: NULL, > +- begin_func: empty_begin_func, > +- camera_func: idlist_camera_func, > +- end_func: empty_end_func > +- }, > +- {name: "gp2ddb", > +- descr: "gphoto2 device database (PRE-ALPHA)", > +- help: "PRE-ALPHA test stage, do not use for production! Machine > parseable.", > +- paramdescr: NULL, > +- begin_func: ddb_begin_func, > +- camera_func: ddb_camera_func, > +- end_func: ddb_end_func > ++ "<NAME_OF_HOTPLUG_SCRIPT>", > ++ empty_begin_func, > ++ hotplug_camera_func, > ++ empty_end_func > ++ }, > ++ {"hal-fdi", > ++ "fdi file for HAL", > ++ "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2.fdi", > ++ NULL, > ++ fdi_begin_func, > ++ fdi_camera_func, > ++ fdi_end_func > ++ }, > ++ {"hal-fdi-device", > ++ "fdi device file for HAL", > ++ "Put it into > /usr/share/hal/fdi/information/10freedesktop/10-camera-libgphoto2-device.fdi", > ++ NULL, > ++ fdi_device_begin_func, > ++ fdi_device_camera_func, > ++ fdi_device_end_func > ++ }, > ++ {"udev-rules", > ++ "udev < 0.98 rules file", > ++ "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, group > or add script to run", > ++ "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ", > ++ udev_begin_func, > ++ udev_camera_func, > ++ udev_end_func > ++ }, > ++ {"udev-rules-0.98", > ++ "udev >= 0.98 rules file", > ++ "Put it into /etc/udev/libgphoto2.rules, set file mode, owner, group > or add script to run, for udev >= 0.98", > ++ "( <PATH_TO_SCRIPT> | [mode <mode>|owner <owner>|group <group>]* ) ", > ++ udev_098_begin_func, > ++ udev_098_camera_func, > ++ udev_end_func > ++ }, > ++ {"idlist", > ++ "list of IDs and names", > ++ "grep for an ID to find the device name", > ++ NULL, > ++ empty_begin_func, > ++ idlist_camera_func, > ++ empty_end_func > ++ }, > ++ {"gp2ddb", > ++ "gphoto2 device database (PRE-ALPHA)", > ++ "PRE-ALPHA test stage, do not use for production! Machine parseable.", > ++ NULL, > ++ ddb_begin_func, > ++ ddb_camera_func, > ++ ddb_end_func > + }, > + {NULL, NULL, NULL, NULL, > + NULL, NULL, NULL} > Index: patches/libgphoto2-01-gettext.diff > =================================================================== > --- patches/libgphoto2-01-gettext.diff (revision 10113) > +++ patches/libgphoto2-01-gettext.diff (working copy) > @@ -1,9 +1,8 @@ > -diff -urN libgphoto2-2.2.1/configure.in libgphoto2-2.2.1-hacked/configure.in > ---- libgphoto2-2.2.1/configure.in 2006-06-20 07:02:50.000000000 +1200 > -+++ libgphoto2-2.2.1-hacked/configure.in 2006-10-23 21:32:24.048890000 > +1300 > -@@ -102,8 +102,11 @@ > +--- libgphoto2-2.3.0/configure.ac-orig 2006-12-19 21:40:47.663304000 > -0600 > ++++ libgphoto2-2.3.0/configure.ac 2006-12-19 21:40:19.769481000 -0600 > +@@ -194,11 +194,13 @@ dnl ------------------------------------ > > - ALL_LINGUAS="da de es eu fr hu it ja nb pl ru sl sv uk zh_CN" > + ALL_LINGUAS="da de es eu fr hu it ja nl nb pl ru sl sv uk zh_CN" > GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto > Team],[${MAIL_GPHOTO_TRANSLATION}]) > -AM_GNU_GETTEXT_VERSION([0.14.1]) > -AM_GNU_GETTEXT([external]) > @@ -14,23 +13,16 @@ > +AC_SUBST(BUILD_INCLUDED_LIBINTL) > AM_PO_SUBDIRS() > AM_ICONV() > - GP_GETTEXT_FLAGS() > -@@ -152,7 +155,7 @@ > - # before _HEADER_STDC > - AC_HEADER_STDC > - # after _HEADER_STDC > --AC_CHECK_HEADERS(getopt.h unistd.h mcheck.h) > -+AC_CHECK_HEADERS(getopt.h unistd.h mcheck.h limits.h) > - AC_C_INLINE([]) > - AC_C_CONST([]) > - dnl FIXME: AC_STRUCT_TIMEZONE > -diff -urN libgphoto2-2.2.1/libgphoto2_port/configure.in > libgphoto2-2.2.1-hacked/libgphoto2_port/configure.in > ---- libgphoto2-2.2.1/libgphoto2_port/configure.in 2006-06-20 > 07:03:17.000000000 +1200 > -+++ libgphoto2-2.2.1-hacked/libgphoto2_port/configure.in 2006-10-23 > 21:32:24.049871000 +1300 > -@@ -96,8 +96,11 @@ > +-GP_GETTEXT_FLAGS() > > + dnl FIXME: We have to make sure this works first > + dnl AC_CHECK_FUNC(gettext, gettext_without_libintl=true) > +--- libgphoto2-2.3.0/libgphoto2_port/configure.ac-orig 2006-12-19 > 21:38:24.785946000 -0600 > ++++ libgphoto2-2.3.0/libgphoto2_port/configure.ac 2006-12-19 > 21:37:53.257416000 -0600 > +@@ -105,11 +105,13 @@ dnl AC_SUBST(USE_INCLUDED_LIBINTL) > + > GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller > and others],[${MAIL_GPHOTO_TRANSLATION}]) > - ALL_LINGUAS="cs da de fr es eu it ja nb pl pt_BR ru sl sv uk vi zh_CN zh_TW" > + ALL_LINGUAS="cs da de fr es eu it ja nl nb pl pt_BR ru sl sv uk vi zh_CN > zh_TW" > -AM_GNU_GETTEXT_VERSION([0.14.1]) > -AM_GNU_GETTEXT([external]) > +AM_GLIB_GNU_GETTEXT > @@ -40,4 +32,7 @@ > +AC_SUBST(BUILD_INCLUDED_LIBINTL) > AM_PO_SUBDIRS() > AM_ICONV() > - GP_GETTEXT_FLAGS() > +-GP_GETTEXT_FLAGS() > + > + AC_SUBST([localedir],["\$(datadir)/locale"]) > + AM_CPPFLAGS="$AM_CPPFLAGS -DLOCALEDIR=\\\"${localedir}\\\"" > Index: patches/gtkam-03-fixgexif.diff > =================================================================== > --- patches/gtkam-03-fixgexif.diff (revision 0) > +++ patches/gtkam-03-fixgexif.diff (revision 0) > @@ -0,0 +1,151 @@ > +diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am > gtkam-0.1.11/gexif-0.5/Makefile.am > +--- gtkam-0.1.11.after-patch-2/gexif-0.5/Makefile.am 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/gexif-0.5/Makefile.am 2004-06-17 12:11:30.000000000 > -0700 > +@@ -1,5 +1,10 @@ > ++NULL = > + SUBDIRS = intl m4 libjpeg gexif po > + > + ACLOCAL_AMFLAGS = -I m4 > + > +-EXTRA_DIST = config.rpath mkinstalldirs > ++EXTRA_DIST = config.rpath mkinstalldirs \ > ++ intltool-extract.in \ > ++ intltool-merge.in \ > ++ intltool-update.in \ > ++ $(NULL) > +diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in > gtkam-0.1.11/gexif-0.5/configure.in > +--- gtkam-0.1.11.after-patch-2/gexif-0.5/configure.in 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/gexif-0.5/configure.in 2004-06-17 12:11:34.000000000 > -0700 > +@@ -9,8 +9,15 @@ > + dnl > --------------------------------------------------------------------------- > + dnl i18n support > + dnl > --------------------------------------------------------------------------- > ++GETTEXT_PACKAGE=gexif > ++AC_SUBST(GETTEXT_PACKAGE) > ++AC_PROG_INTLTOOL > + ALL_LINGUAS="de es fr" > +-AM_GNU_GETTEXT > ++AM_GLIB_GNU_GETTEXT > ++USE_INCLUDED_LIBINTL=no > ++AC_SUBST(USE_INCLUDED_LIBINTL) > ++BUILD_INCLUDED_LIBINTL=no > ++AC_SUBST(BUILD_INCLUDED_LIBINTL) > + > + dnl > --------------------------------------------------------------------------- > + dnl libexif > +@@ -26,7 +33,13 @@ > + AC_SUBST(GEXIF_LIBS) > + AC_SUBST(GEXIF_CFLAGS) > + > +-CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > ++dnl Only use -Wall if we have gcc > ++if test "x$GCC" = "xyes"; then > ++ if test -z "`echo "$CFLAGS" | grep "\-Wall" 2> /dev/null`" ; then > ++ CFLAGS="$CFLAGS -Wall -Wchar-subscripts -Wmissing-declarations > -Wmissing-prototypes -Wnested-externs -Wpointer-arith" > ++ fi > ++fi > ++ > + AC_SUBST(CFLAGS) > + > + AC_OUTPUT([ intl/Makefile po/Makefile.in m4/Makefile > +diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c > gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c > +--- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/gexif-0.5/gexif/gexif-main.c 2004-06-17 > 12:11:30.000000000 -0700 > +@@ -281,7 +281,7 @@ > + action_about (gpointer callback_data, guint callback_action, > + GtkWidget *widget) > + { > +- g_warning ("Implement!"); > ++ g_warning (_("Implement!")); > + } > + > + static void > +@@ -303,19 +303,25 @@ > + > + static GtkItemFactoryEntry mi[] = > + { > +- {"/_File", NULL, 0, 0, "<Branch>"}, > +- {"/File/_Open...", NULL, action_open, 0, "<StockItem>", GTK_STOCK_OPEN}, > +- {"/File/_Save", NULL, action_save, 0, "<StockItem>", GTK_STOCK_SAVE}, > +- {"/File/Save _As...", NULL, action_save_as, 0, "<StockItem>", > ++ {N_("/_File"), NULL, 0, 0, "<Branch>"}, > ++ {N_("/File/_Open..."), NULL, action_open, 0, "<StockItem>", > GTK_STOCK_OPEN}, > ++ {N_("/File/_Save"), NULL, action_save, 0, "<StockItem>", > GTK_STOCK_SAVE}, > ++ {N_("/File/Save _As..."), NULL, action_save_as, 0, "<StockItem>", > + GTK_STOCK_SAVE_AS}, > +- {"/File/sep1", NULL, 0, 0, "<Separator>"}, > +- {"/File/E_xit", NULL, action_exit, 0, "<StockItem>", GTK_STOCK_QUIT}, > +- {"/_View", NULL, 0, 0, "<Branch>"}, > +- {"/View/_Thumbnail", NULL, action_thumbnail, 0, NULL, NULL}, > +- {"/_Help", NULL, 0, 0, "<Branch>"}, > +- {"/Help/About", NULL, action_about, 0, NULL, NULL} > ++ {N_("/File/sep1"), NULL, 0, 0, "<Separator>"}, > ++ {N_("/File/E_xit"), NULL, action_exit, 0, "<StockItem>", > GTK_STOCK_QUIT}, > ++ {N_("/_View"), NULL, 0, 0, "<Branch>"}, > ++ {N_("/View/_Thumbnail"), NULL, action_thumbnail, 0, NULL, NULL}, > ++ {N_("/_Help"), NULL, 0, 0, "<Branch>"}, > ++ {N_("/Help/About"), NULL, action_about, 0, NULL, NULL} > + }; > + > ++static gchar * > ++translate_func (const gchar *path, gpointer data) > ++{ > ++ return g_strdup (_(path)); > ++} > ++ > + GtkWidget * > + gexif_main_new (void) > + { > +@@ -337,6 +343,10 @@ > + ag = gtk_accel_group_new (); > + gtk_window_add_accel_group (GTK_WINDOW (m), ag); > + gif = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>", ag); > ++#ifdef ENABLE_NLS > ++ gtk_item_factory_set_translate_func (GTK_ITEM_FACTORY (gif), > ++ translate_func, NULL, NULL); > ++#endif > + g_object_set_data_full (G_OBJECT (m), "<main>", gif, > + (GDestroyNotify) g_object_unref); > + gtk_item_factory_create_items (gif, G_N_ELEMENTS (mi), mi, m); > +diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c > gtkam-0.1.11/gexif-0.5/gexif/gexif.c > +--- gtkam-0.1.11.after-patch-2/gexif-0.5/gexif/gexif.c 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/gexif-0.5/gexif/gexif.c 2004-06-17 12:11:30.000000000 > -0700 > +@@ -50,6 +50,7 @@ > + > + gtk_set_locale (); > + bindtextdomain (PACKAGE, GEXIF_LOCALEDIR); > ++ bind_textdomain_codeset (PACKAGE, "UTF-8"); > + textdomain (PACKAGE); > + > + gtk_init (&argc, &argv); > +diff -ur gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in > gtkam-0.1.11/gexif-0.5/po/POTFILES.in > +--- gtkam-0.1.11.after-patch-2/gexif-0.5/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/gexif-0.5/po/POTFILES.in 2004-06-17 12:11:30.000000000 > -0700 > +@@ -1 +1,2 @@ > + gexif/gexif-main.c > ++gexif/gexif-thumbnail.c > +diff -ur gtkam-0.1.11.after-patch-2/po/POTFILES.in > gtkam-0.1.11/po/POTFILES.in > +--- gtkam-0.1.11.after-patch-2/po/POTFILES.in 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/po/POTFILES.in 2004-06-17 12:11:18.000000000 -0700 > +@@ -1,3 +1,4 @@ > ++gtkam.desktop.in > + src/gtkam-cancel.c > + src/gtkam-chooser.c > + src/gtkam-close.c > +diff -ur gtkam-0.1.11.after-patch-2/src/gtkam-tree.c > gtkam-0.1.11/src/gtkam-tree.c > +--- gtkam-0.1.11.after-patch-2/src/gtkam-tree.c 2004-06-17 > 12:11:03.000000000 -0700 > ++++ gtkam-0.1.11/src/gtkam-tree.c 2004-06-17 12:11:18.000000000 -0700 > +@@ -1143,9 +1143,10 @@ > + strcmp (model, "Directory Browse")) { > + p = gp_port_info_list_lookup_path (il, port); > + if (p < 0) { > +- g_warning ("Could not find '%s' in port " > +- "info list (%s)!", port, > +- gp_result_as_string (p)); > ++ g_warning (_("Could not find '%s' in port " > ++ "info list (%s)!"), > ++ g_locale_to_utf8 (port, -1, NULL, NULL, > NULL), > ++ g_locale_to_utf8 (gp_result_as_string > (p), -1, NULL, NULL, NULL)); > + gp_camera_unref (camera); > + continue; > + } > Index: Solaris/ChangeLog > =================================================================== > --- Solaris/ChangeLog (revision 10113) > +++ Solaris/ChangeLog (working copy) > @@ -1,3 +1,8 @@ > +2006-12-19 Brian Cameron <brian.cameron at sun.com> > + > + * SUNWgnome-camera.spec: Update spec due to bumping libgphoto2, > + gphoto2, and gtkam releases. > + > 2006-12-19 Damien Carbery <damien.carbery at sun.com> > > * SUNWgnome-file-mgr.spec: Update %files for new graphics files. > Index: Solaris/SUNWgnome-camera.spec > =================================================================== > --- Solaris/SUNWgnome-camera.spec (revision 10113) > +++ Solaris/SUNWgnome-camera.spec (working copy) > @@ -59,14 +59,6 @@ > %gphoto2.prep -d %name-%version > %gtkam.prep -d %name-%version > > -# gphoto2 specifies includes like "#include "gphoto2/foo.h". These files do > -# not exist in the build directory in a gphoto2 subdirectory, so the symbolic > -# links are necessary. > -# > -cd %{_builddir}/%name-%version > -ln -s `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2 > `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2/gphoto2 > -ln -s `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2_port/libgphoto2_port > `pwd`/libgphoto2-%{libgphoto2.version}/libgphoto2_port/libgphoto2_port/gphoto2 > - > %build > export > PKG_CONFIG_PATH=../libgphoto2-%{libgphoto2.version}/libgphoto2:%{_pkg_config_path} > export CFLAGS="%optflags -I%{_includedir}" > @@ -171,6 +163,8 @@ > %{_libdir}/pkgconfig/* > > %changelog > +* Tue Dec 19 2006 - brian.cameron at sun.com > +- Rework spec file after updating gtkam, libgphoto2, gphoto2 spec files. > * Sat Aug 12 2006 - laca at sun.com > - delete some unnecessary env variables > * Tue Jul 25 2006 - damien.carbery at sun.com > Index: libgphoto2.spec > =================================================================== > --- libgphoto2.spec (revision 10113) > +++ libgphoto2.spec (working copy) > @@ -10,8 +10,8 @@ > Name: libgphoto2 > License: LGPL > Group: Library/Hardware/Other > -Version: 2.2.1 > -Release: 1 > +Version: 2.3.0 > +Release: 2 > Distribution: Java Desktop System > Vendor: Sun Microsystems, Inc. > Summary: Digital camera library > @@ -22,12 +22,19 @@ > Patch1: libgphoto2-01-gettext.diff > # date:2004-04-14 type:bug owner:yippi > Patch2: libgphoto2-02-uninstalled-pc.diff > -# date:2006-03-09 type:bug owner:dcarbery > -Patch3: libgphoto2-03-solaris-mntent.diff > -# date:2006-05-11 type:bug owner:laca > -Patch4: libgphoto2-04-pragma-pack.diff > -# date:2006-07-24 type:bug owner:sh162551 > -Patch5: libgphoto2-05-dummy.diff > +# Patch needed because SunStudio hates empty structures. > +# date:2006-12-19 type:bug owner:yippi > +Patch3: libgphoto2-03-fixstruct.diff > +# This patch is needed because M_READ is defined to 0x85 by sys/stream.h > +# date:2006-12-19 type:bug owner:yippi > +Patch4: libgphoto2-04-mars.diff > +# This patch is needed because SunStudio doesn't > +# understand how to define structures the way GCC does. > +# date:2006-12-19 type:bug owner:yippi > +Patch5: libgphoto2-05-fixcameralist.diff > +# The digita driver fails to build without this patch. > +# date:2006-12-19 type:bug owner:yippi > +Patch6: libgphoto2-06-fixlimits.diff > URL: http://www.gphoto.org > BuildRoot: %{_tmppath}/%{name}-%{version}-build > DocDir: %{_defaultdocdir}/libgphoto2 > @@ -59,6 +66,7 @@ > %patch3 -p1 > %patch4 -p1 > %patch5 -p1 > +%patch6 -p1 > > %build > %ifos linux > @@ -89,16 +97,13 @@ > automake -a -f > autoconf > cd .. > -# Removing sierra driver on Solaris since it doesn't compile. > -%ifos solaris > -%define driver_options > "--with-drivers=agfa-cl20,aox,barbie,canon,casio,digita,dimera,directory,fuji,gsmart300,jamcam,jd11,kodak,konica,mustek,largan,minolta,panasonic,pccam300,pccam600,polaroid,ptp2,ricoh,samsung,smal,sipix,sonydscf1,sonydscf55,soundvision,spca50x,sq905,stv0680,sx330z" > +# README! > +# > +# Removing sierra driver on Solaris since it doesn't compile. Note when > +# bumping the version number of libgphoto2, add new drivers to this list. > +# > +%define driver_options > "--with-drivers=adc65,agfa-cl20,aox,barbie,canon,casio,clicksmart310,digigr8,digita,dimera,directory,enigma13,fuji,gsmart300,hp215,iclick,jamcam,jd11,kodak,konica,largan,lg_gsm,mars,minolta,mustek,panasonic,pccam300,pccam600,polaroid,ptp2,ricoh,samsung,sipix,smal,sonix,sonydscf1,sonydscf55,soundvision,spca50x,sq905,stv0674,stv0680,sx330z,template,toshiba" > %define libusb_option "--with-libusb=/usr/sfw" > -export LIBUSB_LIBS="-L/usr/sfw/lib -R/usr/sfw/lib -lusb" > -export LIBUSB_CFLAGS="-I/usr/sfw/include" > -%else > -%define driver_options "--with-drivers=all" > -%define libusb_option "" > -%endif > > PATH="/usr/X11R6/bin:$PATH" CFLAGS="$RPM_OPT_FLAGS -fPIC" ./configure > \ > --prefix=%{_prefix} \ > @@ -151,6 +156,15 @@ > %{_sysconfdir}/hotplug/usb/* > > %changelog -n libgphoto2 > +* Tue Dec 19 2006 - brian.cameron at sunc.om > +- Bump to 2.3.0. This fixes problem with libgphoto needing deprecated > + dbus interface. Add new drivers and a patch to fix compile issue with > + the new mars driver (we were not building this before). Still can't > + compile sierra driver with our compiler. Fix patches to work with > + latest build. Fix unisntalled pc file so that the version number is > + not hardcoded. Instead install pc.in file and build with the correct > + version. > + > * Mon Oct 16 2006 - damien.carbery at sun.com > - Remove the '-f' from the 'rm *.la *.a' lines so that any changes to the > module source will be seen as a build error and action can be taken. > Index: gphoto2.spec > =================================================================== > --- gphoto2.spec (revision 10113) > +++ gphoto2.spec (working copy) > @@ -10,8 +10,8 @@ > Name: gphoto2 > License: GPL > Group: Hardware/Other > -Version: 2.2.0 > -Release: 1 > +Version: 2.3.0 > +Release: 2 > Distribution: Java Desktop System > Vendor: Sun Microsystems, Inc. > Summary: Digital camera utility > @@ -91,6 +91,8 @@ > %{_mandir}/man1/* > > %changelog > +* Tue Dec 19 2006 - brian.cameron at sun.com > +- Bump to 2.3.0. > * Mon Jul 24 2006 - irene.huang at sun.com > - add option --with-libintl-prefix=/usr > * Web Jul 21 2006 - dermot.mccluskey at sun.com >
