debian/0000755000000000000000000000000012234421334007164 5ustar debian/geeqie-common.install0000644000000000000000000000031412234420717013303 0ustar geeqie.xpm /usr/share/pixmaps usr/share/pixmaps usr/lib/geeqie usr/share/doc/geeqie/html usr/share/geeqie/applications usr/share/locale usr/share/man/man1/ debian/plugins/* usr/share/geeqie/applications/ debian/geeqie.preinst0000755000000000000000000000025512234420717012042 0ustar #!/bin/sh set -e # Remove once used alternatives if update-alternatives --query geeqie > /dev/null 2>&1 ; then update-alternatives --remove-all geeqie fi #DEBHELPER# debian/tools/0000755000000000000000000000000012234420717010330 5ustar debian/tools/gqview0000755000000000000000000000021012234420717011551 0ustar #!/bin/sh echo "This is a compatibility alias for Geeqie!" >&2 echo "Please use /usr/bin/geeqie instead!" >&2 exec /usr/bin/geeqie "$@" debian/geeqie.docs0000644000000000000000000000003512234420717011277 0ustar NEWS README README.lirc TODO debian/changelog0000644000000000000000000003223412234420717011046 0ustar geeqie (1:1.1-8) unstable; urgency=low * Preserve timestamp while rotating (Closes: #713980). * Increase MIME priority to 7 (Closes: #717151). * Use dh_autoreconf. * Use canonical VCS URLs in debian/control. * Bump standards to 3.9.4. * Use debhelper 9. -- Michal Čihař Thu, 31 Oct 2013 10:24:23 +0100 geeqie (1:1.1-7) unstable; urgency=low * Upload to unstable. -- Michal Čihař Tue, 07 May 2013 09:57:42 +0200 geeqie (1:1.1-6) experimental; urgency=low * Fixed another FTBFS on some architectures. -- Michal Čihař Thu, 23 Aug 2012 10:18:17 +0200 geeqie (1:1.1-5) experimental; urgency=low * Fixed typo in a patch. -- Michal Čihař Wed, 22 Aug 2012 14:58:48 +0200 geeqie (1:1.1-4) experimental; urgency=low * Another attempt to fix big endians by not using private GdkPixbuf data. -- Michal Čihař Wed, 22 Aug 2012 14:21:51 +0200 geeqie (1:1.1-3) experimental; urgency=low * Fix FTBFS on big endian architectures. -- Michal Čihař Tue, 21 Aug 2012 14:54:43 +0200 geeqie (1:1.1-2) experimental; urgency=low * Fix FTBFS on several architectures. -- Michal Čihař Tue, 21 Aug 2012 13:11:24 +0200 geeqie (1:1.1-1) experimental; urgency=low [ Andreas Metzler ] * New upstream version (Closes: #684987). - Fixes crash on no read permission (Closes: #582636, LP: #617233). - Better handles incorrect file name encodings (Closes: #657041). - Fixes crash on opening new view (Closes: #619976). - Fixes setting background color (LP: #887711). - Correctly shows PGMs (LP: #879290). * Drop patches included upstream. (lfs-suport.patch bug-529531.patch bug-562488.patch bug-574853.patch bug-620895.patch) * Add build-depends on libtiff-dev and libjpeg-dev to make use of newly available custom loaders. [ Michal Čihař ] * Upload to experimental. * Bump standards to 3.9.3. * Use dpkg build flags. * Drop transitional gqview packages. * Stop using alternatives for geeqie (LP: #986499). * Update thumbnail while rotating images (Closes: #669870). -- Michal Čihař Tue, 21 Aug 2012 10:06:33 +0200 geeqie (1:1.0-10.1) unstable; urgency=high * Non-maintainer upload. * Fix FTBFS by making sure $(CURDIR)/debian/tmp/usr/share/doc/geeqie/html exists at the beginning of the dh_auto_install override (Closes: #669543). * Set urgency to “high” for the RC bug fix, needed for the ongoing exiv2 transition. -- Cyril Brulebois Mon, 07 May 2012 21:58:07 +0200 geeqie (1:1.0-10) unstable; urgency=low [ Klaus Ethgen ] * Fix various errors in the French locales. Thanks to Vincent Blut. (Closes: #620895) [ Michal Čihař ] * Make transitional package priority extra and section oldlibs. * Drop geeqie-gps package (Closes: #648430). -- Michal Čihař Wed, 04 Jan 2012 12:43:25 +0100 geeqie (1:1.0-9) unstable; urgency=low [ Klaus Ethgen ] * Fix the handling when creating folders in move dialog. See also upstream commit 556bd46. (Closes: #529531) * Make the documentation and the handling of remote commands consistent. See also upstream 8f9ba41. (Closes: #562488) * Change the icon size of icon_float from 10×20 to 20×20 to avoid scaling. (Closes: #614607) * Fix the chown bug done upstream. Thanks to Vladislav Naumov. (Closes: #574853) [ Michal Čihař ] * Merge from Ubuntu: * Make fullscreen mode actually use the full screen. (LP: #788321, Closes: #639099) -- Michal Čihař Mon, 19 Sep 2011 12:03:24 +0200 geeqie (1:1.0-8) unstable; urgency=low * Build against libchamplain-0.8. * Bump standards to 3.9.2. * Fix lintian overrides. -- Michal Čihař Fri, 15 Apr 2011 12:09:50 +0200 geeqie (1:1.0-7) unstable; urgency=low * Re-enable XPM icon installation (Closes: #590295). * Bump standards to 3.9.1. -- Michal Čihař Mon, 26 Jul 2010 11:50:45 +0200 geeqie (1:1.0-6) unstable; urgency=low * Bump standards to 3.9.0. * Build with large file support (Closes: #550449). * Replace Conflicts with Breaks. -- Michal Čihař Thu, 08 Jul 2010 09:05:39 +0200 geeqie (1:1.0-5) unstable; urgency=low * Fix typo in prerm script to fix uninstallation of alternative. -- Michal Čihař Thu, 17 Jun 2010 17:14:59 +0200 geeqie (1:1.0-4) unstable; urgency=low * Rebuild against fixed libexiv version and build conflict with broken one (Closes: #586058). -- Michal Čihař Wed, 16 Jun 2010 10:15:24 +0200 geeqie (1:1.0-3) unstable; urgency=low * Downgrade ufraw dependency to suggests (Closes: #583083). * Add missing prerm snipped for alternatives. -- Michal Čihař Mon, 14 Jun 2010 15:20:06 +0200 geeqie (1:1.0-2) unstable; urgency=low * Recommend librsvg2-common for SVG support (Closes: #575730). * Fix bashism in geeqie-rotate (Closes: #581100). -- Michal Čihař Tue, 11 May 2010 10:09:51 +0200 geeqie (1:1.0-1) unstable; urgency=low * New upstream version. * Also rotate thumbnail when rotating image (Closes: #563876). * All patches merged upstream. * Run autoreconf during build and avoid autoreconf patch. * Bump standards to 3.8.4. * Build depend on gnome-doc-utils to get documentation. -- Michal Čihař Fri, 26 Feb 2010 10:41:38 +0100 geeqie (1:1.0~beta2-9) unstable; urgency=low * Add plugins for lossless rotation (Closes: #330543, #562538). * Better description of geeqie-gps package. * Include README.lirc in documentation (Closes: #563282). * Update README.Debian to match current state of GQview/Geeqie (Closes: #562489). -- Michal Čihař Sat, 02 Jan 2010 11:28:50 +0100 geeqie (1:1.0~beta2-8) unstable; urgency=low * Convert to 3.0 (quilt) source format. * Fix conflicts/replaces of -common package (epoch was forgotten) (Closes: #557764). -- Michal Čihař Tue, 24 Nov 2009 13:34:42 +0100 geeqie (1:1.0~beta2-7) unstable; urgency=low * Drop -simple package and provide -gps package instead. - Standard geeqie does not need GLX anymore (Closes: #554569, #553910). * Fix FTBFS on hurd. * Package geeqie-common now includes some things from geeqie package. -- Michal Čihař Mon, 09 Nov 2009 12:00:16 +0100 geeqie (1:1.0~beta2-6) unstable; urgency=low [ Cristian Greco ] * debian/{control,rules}: first attempt to build a geeqie-simple package (Closes: #553676). [ Michal Čihař ] * Improve description of simple/normal packages. * Proper capilatisation of GQview and Geeqie in description. * Make debug and common packages depend on either of geeqie | geeqie-simple. -- Michal Čihař Tue, 03 Nov 2009 14:46:48 +0100 geeqie (1:1.0~beta2-5) unstable; urgency=low * Fix typo in suggests. * Recommend exiv2 it is used by rotate and ufraw plugin. * Recommend ufraw and zenity for ufraw plugin. * Recommend imagemagick for rotate plugin. -- Michal Čihař Mon, 02 Nov 2009 16:06:28 +0100 geeqie (1:1.0~beta2-4) unstable; urgency=low * Add MIME handler for image/pjpeg (Closes: #507681). * Recommend exiftran which is now used for rotating. * Fix infinite loop on map (Closes: #553588). -- Michal Čihař Mon, 02 Nov 2009 11:28:58 +0100 geeqie (1:1.0~beta2-3) unstable; urgency=low [ Daniel Baumann ] * GQview is going to removed from debian in favour for geeqie as its successor. Therefore, adding a transitional package for gqview (Closes: #520616). [ Michal Čihař ] * gqview package provides compatibility script which calls geeqie. * Drop stability warnings, it should not be the case anymore. * Update Cristians email address. * Add transitional package for geeqie-dbg. -- Michal Čihař Fri, 30 Oct 2009 14:11:45 +0100 geeqie (1.0~beta2-2) unstable; urgency=low * Change build depends to new libchamplain. * Added patch to build with new libchamplain. * Use some patches from svn to fix compilation with recent clutter and champlain. -- Michal Čihař Mon, 21 Sep 2009 13:15:09 +0200 geeqie (1.0~beta2-1) unstable; urgency=low [ Cristian Greco ] * New Upstream version: - fix removing folded images with delete (Closes: #528031), - should rebuild against new libchamplain (Closes: #535457). * geeqie{,-common}.install: install helper scripts and their .desktop files. * debian/control: - build depends on intltool; - fix vcs-git url. -- Michal Čihař Wed, 08 Jul 2009 15:44:30 +0200 geeqie (1.0~beta1-2) unstable; urgency=low [ Cristian Greco ] * debian/{control,rules}: build-depends on libchamplain and libclutter and build with gps support enabled. * add debian/clean to simplify debian/rules. * debian/rules: simplify using override_dh_auto_build. [ Michal Čihař ] * Update standards to 3.8.2 (no changes required). -- Michal Čihař Mon, 22 Jun 2009 15:59:26 +0200 geeqie (1.0~beta1-1) unstable; urgency=low [ Cristian Greco ] * New upstream version. (Closes: #514494) - debian/patches: remove all patches (fix-lirc.patch and fix- sortbug.patch), fixed upstream. - debian/geeqie.install: install files under /usr/share/geeqie/* needed by new geeqie plugins. - debian/watch: add support for mangling upstream (alpha|beta|rc) releases. * debian/copyright: update copyright translations info a bit. * debian/control: switch to Vcs-Git maintenance. * debian/gbp.conf: add minimal git-buildpackage conf file in debian/ for standard collab-maint options. -- Michal Čihař Thu, 04 Jun 2009 16:18:11 +0200 geeqie (1.0~alpha3-5) unstable; urgency=low * Adjust -dbg package section. * Simplify debian/rules by using overrides. * Update to standards 3.8.1 (no changes needed). -- Michal Čihař Thu, 07 May 2009 14:47:17 +0200 geeqie (1.0~alpha3-4) unstable; urgency=low [ Cristian Greco ] * debian/patches: added fix-sortbug.patch by upstream, should fix image sorting bug (Closes: #515165). -- Michal Čihař Thu, 19 Feb 2009 15:55:03 +0100 geeqie (1.0~alpha3-3) unstable; urgency=low [ Cristian Greco ] * debian/rules: really reenable lirc support. * debian/README.source: added. -- Michal Čihař Fri, 13 Feb 2009 16:58:04 +0100 geeqie (1.0~alpha3-2) unstable; urgency=low [ Cristian Greco ] * debian/rules: + build using "-Wl,--as-needed"; + improve 'clean' target. * debian/control: + updated email address in Uploaders: field. * Updated debian/copyright. [ Michal Čihař ] * Reenabled lirc support by applying upstream fix. -- Michal Čihař Thu, 12 Feb 2009 10:36:45 +0100 geeqie (1.0~alpha3-1) unstable; urgency=low * New upstream version. - Writing of configuration is safe on full disk (Closes: #501131). - OSD state is not lost when leaving full screen (Closes: #508669). * Temporarily disable lirc support, it is broken upstream. * Dropped debian/README.source as we don't use dpatch. * Switch Vcs-Browser to viewsvn. * Add ${misc:Depends} to all packages. * Updated debian/copyright. -- Michal Čihař Mon, 26 Jan 2009 09:06:29 +0100 geeqie (1.0~alpha2-1) unstable; urgency=low * New upstream version. - We can drop all patches as they were integrated upstream. * Fix version mangling in watch file. * Enable lirc support. -- Michal Čihař Thu, 31 Jul 2008 10:48:21 +0200 geeqie (1.0~alpha1-7) unstable; urgency=low * Add README.source to point to dpatch usage. -- Michal Čihař Mon, 14 Jul 2008 00:08:08 +0200 geeqie (1.0~alpha1-6) unstable; urgency=low * New patch 'help-browser.dpatch': use sensible-browser in Debian to display help page when F1 is pressed (Closes: #490154). * debian/rules: - add new target 'install-stamp'; - delete xpm icon when running target 'clean'. -- Cristian Greco Sun, 13 Jul 2008 23:20:05 +0200 geeqie (1.0~alpha1-5) unstable; urgency=low * Add debug package. -- Michal Čihař Mon, 07 Jul 2008 00:44:50 +0200 geeqie (1.0~alpha1-4) unstable; urgency=low [ Michal Čihař ] * Update to policy 3.8.0 (no changes needed). [ Cristian Greco ] * Fix typo in "desktop-file.dpatch" patch name (was destop-file.dpatch) * Add copyright information for po/*.po -- Michal Čihař Tue, 10 Jun 2008 08:42:37 +0200 geeqie (1.0~alpha1-3) unstable; urgency=low * Add license information for doc/*. -- Michal Čihař Mon, 26 May 2008 09:06:49 +0200 geeqie (1.0~alpha1-2) unstable; urgency=low [ Michal Čihař ] * Adjust Vcs headers to use ext-maint instead of deb-maint. [ Cristian Greco ] * Fix URL in debian/copyright. -- Michal Čihař Thu, 15 May 2008 17:43:38 +0200 geeqie (1.0~alpha1-1) unstable; urgency=low * Initial release (Closes: #480874). -- Michal Čihař Wed, 14 May 2008 10:00:34 +0200 debian/patches/0000755000000000000000000000000012234420717010617 5ustar debian/patches/series0000644000000000000000000000025012234420717012031 0ustar Fix-big-endian-support-in-tiff-loader.patch More-use-of-const-fix-up-a-warning.patch Do-not-access-private-GdkPixbuf-data.patch fix-bashishm.patch fix-fullscreen.patch debian/patches/More-use-of-const-fix-up-a-warning.patch0000644000000000000000000000725712234420717020164 0ustar From 20544048d99f4074e1aec280101b973bb2003cee Mon Sep 17 00:00:00 2001 From: Laurent Monin Date: Mon, 14 May 2012 23:01:01 +0200 Subject: [PATCH 1/1] More use of const, fix up a warning. --- src/jpeg_parser.c | 20 ++++++++++---------- src/jpeg_parser.h | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/jpeg_parser.c b/src/jpeg_parser.c index 990ec4b..4fc8332 100644 --- a/src/jpeg_parser.c +++ b/src/jpeg_parser.c @@ -13,7 +13,7 @@ #include "main.h" #include "jpeg_parser.h" -gboolean jpeg_segment_find(guchar *data, guint size, +gboolean jpeg_segment_find(const guchar *data, guint size, guchar app_marker, const gchar *magic, guint magic_len, guint *seg_offset, guint *seg_length) { @@ -64,7 +64,7 @@ typedef enum { -guint16 tiff_byte_get_int16(guchar *f, TiffByteOrder bo) +guint16 tiff_byte_get_int16(const guchar *f, TiffByteOrder bo) { guint16 align_buf; @@ -76,7 +76,7 @@ guint16 tiff_byte_get_int16(guchar *f, TiffByteOrder bo) return GUINT16_FROM_BE(align_buf); } -guint32 tiff_byte_get_int32(guchar *f, TiffByteOrder bo) +guint32 tiff_byte_get_int32(const guchar *f, TiffByteOrder bo) { guint32 align_buf; @@ -120,7 +120,7 @@ void tiff_byte_put_int32(guchar *f, guint32 n, TiffByteOrder bo) memcpy(f, &align_buf, sizeof(guint32)); } -gint tiff_directory_offset(guchar *data, const guint len, +gint tiff_directory_offset(const guchar *data, const guint len, guint *offset, TiffByteOrder *bo) { if (len < 8) return FALSE; @@ -148,12 +148,12 @@ gint tiff_directory_offset(guchar *data, const guint len, return (*offset < len); } -typedef gint (* FuncParseIFDEntry)(guchar *tiff, guint offset, +typedef gint (* FuncParseIFDEntry)(const guchar *tiff, guint offset, guint size, TiffByteOrder bo, gpointer data); -gint tiff_parse_IFD_table(guchar *tiff, guint offset, +gint tiff_parse_IFD_table(const guchar *tiff, guint offset, guint size, TiffByteOrder bo, guint *next_offset, FuncParseIFDEntry parse_entry, gpointer data) @@ -182,7 +182,7 @@ gint tiff_parse_IFD_table(guchar *tiff, guint offset, return 0; } -static gint mpo_parse_Index_IFD_entry(guchar *tiff, guint offset, +static gint mpo_parse_Index_IFD_entry(const guchar *tiff, guint offset, guint size, TiffByteOrder bo, gpointer data) { @@ -254,7 +254,7 @@ static gint mpo_parse_Index_IFD_entry(guchar *tiff, guint offset, return 0; } -static gint mpo_parse_Attributes_IFD_entry(guchar *tiff, guint offset, +static gint mpo_parse_Attributes_IFD_entry(const guchar *tiff, guint offset, guint size, TiffByteOrder bo, gpointer data) { @@ -310,7 +310,7 @@ Roll Angle RollAngle 45581 B20D return 0; } -MPOData *jpeg_get_mpo_data(guchar *data, guint size) +MPOData *jpeg_get_mpo_data(const guchar *data, guint size) { guint seg_offset; guint seg_size; @@ -383,4 +383,4 @@ void jpeg_mpo_data_free(MPOData *mpo) if (mpo->images) g_free(mpo->images); g_free(mpo); } -} \ No newline at end of file +} diff --git a/src/jpeg_parser.h b/src/jpeg_parser.h index d3f4b1a..0d65343 100644 --- a/src/jpeg_parser.h +++ b/src/jpeg_parser.h @@ -31,7 +31,7 @@ NNN.: the data in this segment */ -gboolean jpeg_segment_find(guchar *data, guint size, +gboolean jpeg_segment_find(const guchar *data, guint size, guchar app_marker, const gchar *magic, guint magic_len, guint *seg_offset, guint *seg_length); @@ -76,7 +76,7 @@ struct _MPOData { MPOEntry *images; }; -MPOData* jpeg_get_mpo_data(guchar *data, guint size); +MPOData* jpeg_get_mpo_data(const guchar *data, guint size); void jpeg_mpo_data_free(MPOData *mpo); -#endif \ No newline at end of file +#endif -- 1.7.10.4 debian/patches/Fix-big-endian-support-in-tiff-loader.patch0000644000000000000000000000173612234420717020700 0ustar From 902157eeea55c4fe7e626977f8d2b161352b63dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 21 Aug 2012 14:53:05 +0200 Subject: [PATCH] Fix big endian support in tiff loader --- src/image_load_tiff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/image_load_tiff.c b/src/image_load_tiff.c index d32899c..71a33b8 100644 --- a/src/image_load_tiff.c +++ b/src/image_load_tiff.c @@ -326,7 +326,7 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz /* Turns out that the packing used by TIFFRGBAImage depends on * the host byte order... */ - while (pixels < pixbuf->pixels + bytes) + while (pixels < lt->pixbuf->pixels + bytes) { uint32 pixel = *(uint32 *)pixels; int r = TIFFGetR(pixel); @@ -419,4 +419,4 @@ void image_loader_backend_set_tiff(ImageLoaderBackend *funcs) -#endif \ No newline at end of file +#endif -- 1.7.10.4 debian/patches/fix-fullscreen.patch0000644000000000000000000001146512234420717014575 0ustar Description: Make fullscreen modes actually use the full screen. The default fullscreen mode now leaves everything up to the window manager, which usually produces the best result. Custom fullscreen modes now use override-redirect to ensure docks and panels never obscure the image. Author: Daniel van Vugt Bug: http://sourceforge.net/support/tracker.php?aid=2925034 Bug-Ubuntu: https://launchpad.net/bugs/788321 Forwarded: yes === modified file 'src/fullscreen.c' --- old/src/fullscreen.c 2010-02-26 10:41:38 +0000 +++ new/src/fullscreen.c 2011-08-16 03:55:04 +0000 @@ -218,75 +218,65 @@ void (*stop_func)(FullScreenData *, gpointer), gpointer stop_data) { FullScreenData *fs; - GdkScreen *screen; - gboolean same; - gint x, y; - gint w, h; - GdkGeometry geometry; if (!window || !imd) return NULL; + DEBUG_1("full screen requests screen %d", options->fullscreen.screen); + fs = g_new0(FullScreenData, 1); - fs->cursor_state = FULLSCREEN_CURSOR_HIDDEN; - fs->normal_window = window; fs->normal_imd = imd; - fs->stop_func = stop_func; fs->stop_data = stop_data; - - DEBUG_1("full screen requests screen %d", options->fullscreen.screen); - fullscreen_prefs_get_geometry(options->fullscreen.screen, window, &x, &y, &w, &h, - &screen, &same); - - fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, _("Full screen")); - - /* this requests no decorations, if you still have them complain to the window manager author(s) */ - gtk_window_set_decorated(GTK_WINDOW(fs->window), FALSE); + fs->window = window_new(GTK_WINDOW_TOPLEVEL, "fullscreen", NULL, NULL, + _("Full screen")); if (options->fullscreen.screen < 0) - { - /* If we want control of the window size and position this is not what we want. - * Geeqie needs control of which monitor(s) to use for full screen. - */ + { /* Fullscreen as determined by the window manager... */ gtk_window_fullscreen(GTK_WINDOW(fs->window)); } - else if (options->fullscreen.above) - { - /* request to be above other windows */ - gtk_window_set_keep_above(GTK_WINDOW(fs->window), TRUE); + else + { /* Custom fullscreen modes. Done by hand, the hard way... */ + GdkScreen *screen; + gint x, y, w, h; + GdkGeometry geometry; + GtkWindow *gtkwin = GTK_WINDOW(fs->window); + GdkWindow *gdkwin; + + fullscreen_prefs_get_geometry(options->fullscreen.screen, + window, &x, &y, &w, &h, &screen, NULL); + + if (options->fullscreen.above) + gtk_window_set_keep_above(gtkwin, TRUE); + + gtk_window_set_screen(gtkwin, screen); + gtk_window_set_decorated(gtkwin, FALSE); + gtk_window_set_resizable(gtkwin, FALSE); + gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); + + geometry.min_width = w; + geometry.min_height = h; + geometry.max_width = w; + geometry.max_height = h; + geometry.base_width = w; + geometry.base_height = h; + gtk_window_set_geometry_hints(gtkwin, fs->window, &geometry, + GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | + GDK_HINT_BASE_SIZE); + + gtk_window_set_default_size(gtkwin, w, h); + gtk_window_move(gtkwin, x, y); + + gtk_widget_realize(fs->window); + gdkwin = gtk_widget_get_window(fs->window); + if (gdkwin != NULL) + gdk_window_set_override_redirect(gdkwin, TRUE); } - gtk_window_set_resizable(GTK_WINDOW(fs->window), FALSE); - - gtk_window_set_screen(GTK_WINDOW(fs->window), screen); - gtk_container_set_border_width(GTK_CONTAINER(fs->window), 0); g_signal_connect(G_OBJECT(fs->window), "delete_event", G_CALLBACK(fullscreen_delete_cb), fs); - geometry.min_width = w; - geometry.min_height = h; - geometry.max_width = w; - geometry.max_height = h; - geometry.base_width = w; - geometry.base_height = h; - geometry.win_gravity = GDK_GRAVITY_STATIC; - /* By setting USER_POS and USER_SIZE, most window managers will - * not request positioning of the full screen window (for example twm). - * - * In addition, setting gravity to STATIC will result in the - * decorations of twm to not effect the requested window position, - * the decorations will simply be off screen, except in multi monitor setups :-/ - */ - gtk_window_set_geometry_hints(GTK_WINDOW(fs->window), fs->window, &geometry, - GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE | GDK_HINT_BASE_SIZE | - GDK_HINT_WIN_GRAVITY | - GDK_HINT_USER_POS); - - gtk_window_set_default_size(GTK_WINDOW(fs->window), w, h); - gtk_window_move(GTK_WINDOW(fs->window), x, y); - fs->imd = image_new(FALSE); gtk_container_add(GTK_CONTAINER(fs->window), fs->imd->widget); @@ -393,7 +383,11 @@ else { gdk_screen_get_monitor_geometry(screen, j, &rect); - subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); + subname = gdk_screen_get_monitor_plug_name(screen, j); + if (subname == NULL) + { + subname = g_strdup_printf("%s %d", _("Monitor"), j + 1); + } } sd = g_new0(ScreenData, 1); debian/patches/Do-not-access-private-GdkPixbuf-data.patch0000644000000000000000000000312412234420717020477 0ustar From 28bcc9fb92b214dd0b21b96e79952b15f3efa520 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Aug 2012 14:20:31 +0200 Subject: [PATCH] Do not access private GdkPixbuf data The GdkPixbuf is private to Gdk, so we can not access it, rather use numbers and data we anyway have. --- src/image_load_tiff.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/image_load_tiff.c b/src/image_load_tiff.c index 71a33b8..305de18 100644 --- a/src/image_load_tiff.c +++ b/src/image_load_tiff.c @@ -148,6 +148,9 @@ tiff_load_unmap_file (thandle_t handle, tdata_t data, toff_t offset) static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsize count, GError **error) { ImageLoaderTiff *lt = (ImageLoaderTiff *) loader; +#if G_BYTE_ORDER == G_BIG_ENDIAN + int i; +#endif TIFF *tiff; guchar *pixels = NULL; @@ -326,17 +329,17 @@ static gboolean image_loader_tiff_load (gpointer loader, const guchar *buf, gsiz /* Turns out that the packing used by TIFFRGBAImage depends on * the host byte order... */ - while (pixels < lt->pixbuf->pixels + bytes) + for (i = 0; i < bytes;) { - uint32 pixel = *(uint32 *)pixels; + uint32 pixel = *(uint32 *)(pixels + i); int r = TIFFGetR(pixel); int g = TIFFGetG(pixel); int b = TIFFGetB(pixel); int a = TIFFGetA(pixel); - *pixels++ = r; - *pixels++ = g; - *pixels++ = b; - *pixels++ = a; + pixels[i++] = r; + pixels[i++] = g; + pixels[i++] = b; + pixels[i++] = a; } #endif -- 1.7.10.4 debian/patches/fix-bashishm.patch0000644000000000000000000000116512234420717014225 0ustar Subject: Fix bashism From: Michal Čihař Forwarded: https://sourceforge.net/tracker/?func=detail&aid=2999814&group_id=222125&atid=1054682 --- a/plugins/rotate/geeqie-rotate +++ b/plugins/rotate/geeqie-rotate @@ -8,7 +8,7 @@ rotate() { ext=`echo "${1##*.}" |tr "[:upper:]" "[:lower:]"` - [ "x$ext" == "x" ] && return 1 #no extension + [ "x$ext" = "x" ] && return 1 #no extension gq_metadata="$GQ_METADATA_DIR/$1.gq.xmp" if [ -f "$gq_metadata" ]; then @@ -48,7 +48,7 @@ } get_sidecars= -if [ "x$1" == "x-g" ] ; then +if [ "x$1" = "x-g" ] ; then get_sidecars=yes shift fi debian/copyright0000644000000000000000000002011712234420717011124 0ustar This package was debianized by Michal Čihař on Wed, 14 May 2008 10:00:34 +0200. It was downloaded from http://geeqie.sourceforge.net/ Upstream Authors: John Ellis (Original author and maintainer of GQview) Vladimir Nadvornik (Maintainer of Geeqie) Petr Ostadal Laurent Monin Copyright: Copyright © 2004-2006 John Ellis Copyright © 2008-2012 The Geeqie Team License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. Files: src/md5-util.* Copyright: Copyright © 1993 Branko Lankester Copyright © 1993 Colin Plumb Copyright © 1995 Erik Troan License: This code is in the public domain; do with it what you wish. Files: src/cellrenderericon.* Copyright: Copyright © 2000 Red Hat, Inc., Jonathan Blandford License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA On Debian systems, the complete text of the GNU Lesser General Public License can be found in `/usr/share/common-licenses/LGPL-2'. Files: doc/* Copyright: Copyright © 2006 John Ellis License: Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.2 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. Even though OpenOffice.org document is mentioned as source, new upstream uses HTML files as source. On Debian systems, the complete text of the GNU Free Documentation License can be found in `/usr/share/common-licenses/GFDL-1.2'. Files: po/*.po Copyright: see below License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Detailed copyright holder report (were available): po/ar.po: Copyright © 2004 John Ellis po/be.po: Copyright © 2006 Pavel Piatruk po/bg.po: Copyright © 2005 John Ellis, Vladimir Petrov po/ca.po: Copyright © 2003 Penbwrdd yn Gymraeg po/cs.po: Copyright © 2001,2004,2005 Jan Raska , Copyright © 2002 Aktualizace Michal Bukovjan Copyright © 2009 Vladimír Nádvorník po/da.po: Copyright © 2001 Birger Langkjer po/de.po: Copyright © 1999 John Ellis, Matthias Warkus Copyright © 2005 Danny Milosavljevic Copyright © 2006 Ronny Steiner Copyright © 2009 Klaus Ethgen po/eo.po: Copyright © 2006 Antonio C. Codazzi "la Filozofo" po/es.po: Copyright © 2000 Rodrigo Sancho Senosiain Copyright © 2003,2004,2005 Ariel Fermani po/et.po: Copyright © 2001,2002 Ilmar Kerm po/eu.po: Copyright © 2006 Piarres Beobide po/fi.po: Copyright © 2001-2006 Lauri Nurmi po/fr.po: Copyright © 2000 Jean-Pierre Pedron Copyright © 2003 Pascal Bleser Copyright © 2003 Nicolas Boos Copyright © 2003-2004 Nicolas Bonifas Copyright © 2001-2002,2004-2005 Eric Lassauge Copyright © 2008 Laurent Monin po/hu.po: Copyright © 2001 Mátyás Tibor Copyright © 2004 Koblinger Egmont Copyright © 2004 Sári Gábor po/id.po: Copyright © 2003 John Ellis Copyright © 2003 Tedi Heriyanto po/it.po: Copyright © 2006 Kostantino Copyright © 2000-2001 Christopher R. Gabriel po/ja.po: Copyright © 2001 SATO Satoru Copyright © 2002 Junichi Uekawa Copyright © 2000-2005 Takeshi Aihana po/ko.po: Copyright © 2006 Hyun-Jin Moon po/nb.po: Copyright © 2001 Torgeir Ness Sundli po/nl.po: Copyright © 2001 Hette J Visser Copyright © 2003,2004,2005 Tino Meinen po/pl.po: Copyright © 2004 Wit Wiliński po/pt_BR.po: Copyright © 2001 Guilherme M. Schroeder Copyright © 2005 Herval Ribeiro de Azevêdo po/ro.po: Copyright © 2002 Harald Ersch Copyright © 2004 Harald Ersch po/ru.po: Copyright © 1999 Oleg Andryuschenko Copyright © 2000 Michael Bravo Copyright © 2001 drF_ckoff Copyright © 2002 Oleg Andryuschenko Copyright © 2003-2004 drF_ckoff Copyright © 2005 Vitaly Lipatov po/sk.po: Copyright © 2000 Martin Pekar Copyright © 2001,2004 Ivan Priesol po/sl.po: Copyright © 2001 Matej Erman po/sv.po: Copyright © 2003 John Ellis Copyright © 2003-2005 Hans Öfverbeck po/th.po: Copyright © 2002 Phanumas Thanyaboon po/tr.po: Copyright © 1999-2000 Fatih Demir po/uk.po: Copyright © 2001,2002 Volodymyr M. Lisivka Copyright © 2002 Olexander Kunytsa po/vi.po: Copyright © 2002 pclouds po/zh_CN.GB2312.po: Copyright © 2001 Wu Yulun po/zh_TW.po: Copyright © 2000 Kam Tik Copyright © 2001 Abel Cheung On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. The Debian packaging is Copyright © 2008-2009, Michal Čihař and is licensed under the GPL, see above. debian/gbp.conf0000644000000000000000000000014612234420717010610 0ustar # Configuration file for git-buildpackage and friends [DEFAULT] sign-tags = True pristine-tar = True debian/clean0000644000000000000000000000001312234420717010167 0ustar geeqie.xpm debian/control0000644000000000000000000000402212234420717010571 0ustar Source: geeqie Section: graphics Priority: optional Maintainer: Michal Čihař Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), dh-autoreconf, libtool, autoconf, automake, autotools-dev, cvs, libgtk2.0-dev, libexiv2-dev, liblcms1-dev, liblircclient-dev, intltool, gnome-doc-utils, imagemagick, libtiff-dev, libjpeg-dev Build-Conflicts: libexiv2-dev (= 0.19-2) Standards-Version: 3.9.4 Homepage: http://geeqie.sourceforge.net/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/geeqie.git Vcs-Git: git://anonscm.debian.org/collab-maint/geeqie.git Package: geeqie Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, geeqie-common (= ${source:Version}) Recommends: exiftran, exiv2, ufraw-batch, zenity, imagemagick, librsvg2-common Suggests: gimp, xpaint, geeqie-dbg, libjpeg-progs, ufraw Breaks: gqview (<< 1:1.0~beta2-3) Replaces: gqview Description: image viewer using GTK+ Geeqie is a browser for graphics files offering single click viewing of your graphics files. It includes thumbnail view, zoom, filtering features and external editor support. Package: geeqie-common Architecture: all Recommends: geeqie Depends: ${misc:Depends} Replaces: geeqie (<< 1:1.0~beta2-7) Breaks: geeqie (<< 1:1.0~beta2-7) Description: data files for Geeqie Geeqie is a browser for graphics files offering single click viewing of your graphics files. It includes thumbnail view, zoom, filtering features and external editor support. . This package contains data files for Geeqie such as documentation or locales. Package: geeqie-dbg Section: debug Priority: extra Architecture: any Depends: geeqie (= ${binary:Version}), ${misc:Depends} Breaks: gqview-dbg (<< 1:1.0~beta2-3) Replaces: gqview-dbg Description: debug symbols for Geeqie Geeqie is a browser for graphics files offering single click viewing of your graphics files. It includes thumbnail view, zoom, filtering features and external editor support. . This package contains the debugging symbols. debian/watch0000644000000000000000000000015112234420717010216 0ustar version=3 opts="uversionmangle=s/(alpha|beta|rc)/~$1/" \ http://sf.net/geeqie/geeqie-(.*)\.tar\.gz debian/compat0000644000000000000000000000000212234420717010366 0ustar 9 debian/geeqie-common.doc-base0000644000000000000000000000035412234420717013316 0ustar Document: geeqie Title: The Geeqie User Manual. Author: John Ellis Abstract: This manual describes how to use Geeqie. Section: Graphics Format: HTML Index: /usr/share/doc/geeqie/html/index.html Files: /usr/share/doc/geeqie/html/*.html debian/geeqie.menu0000644000000000000000000000032012234420717011310 0ustar ?package(geeqie): \ needs="X11" \ section="Applications/Graphics" \ title="Geeqie" \ command="/usr/bin/geeqie" \ icon="/usr/share/pixmaps/geeqie.xpm" \ longtitle="Geeqie Image Viewer" debian/plugins/0000755000000000000000000000000012234420717010651 5ustar debian/plugins/rotate-90.desktop0000644000000000000000000000065612234420717013777 0ustar [Desktop Entry] Version=1.0 Type=Application Name=Losslessly rotate JPEG image clockwise # call the helper script TryExec=exiftran Exec=exiftran -9 -i -g -p %f # Desktop files that are usable only in Geeqie should be marked like this: Categories=X-Geeqie; OnlyShowIn=X-Geeqie; # Show in menu "Edit/Orientation" X-Geeqie-Menu-Path=EditMenu/OrientationMenu # It can be made verbose # X-Geeqie-Verbose=true MimeType=image/jpeg; debian/plugins/rotate-270.desktop0000644000000000000000000000066512234420717014057 0ustar [Desktop Entry] Version=1.0 Type=Application Name=Losslessly rotate JPEG image counterclockwise # call the helper script TryExec=exiftran Exec=exiftran -2 -i -g -p %f # Desktop files that are usable only in Geeqie should be marked like this: Categories=X-Geeqie; OnlyShowIn=X-Geeqie; # Show in menu "Edit/Orientation" X-Geeqie-Menu-Path=EditMenu/OrientationMenu # It can be made verbose # X-Geeqie-Verbose=true MimeType=image/jpeg; debian/geeqie.install0000644000000000000000000000005612234420717012020 0ustar usr/bin/geeqie usr/share/applications/geeqie* debian/README.Debian0000644000000000000000000000071112234420717011230 0ustar Geeqie for Debian ----------------- Upstream lost interest in GQview and new authors took over the code from GQview and continued to develop it under new name Geeqie. This is reason (together with fact that nobody was willing to maintain gqview package in Debian) for Geeqie replacing GQview in Debian. Package is maintained in collab-maint repository and you're welcome to join us. -- Michal Čihař Sat, 02 Jan 2010 11:19:29 +0100 debian/geeqie.mime0000644000000000000000000000226312234420717011303 0ustar image/jpeg; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/pjpeg; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/png; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/gif; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/tiff; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-portable-bitmap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-portable-graymap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-portable-anymap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-portable-pixmap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-xbitmap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-xpixmap; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-ms-bmp; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-icon; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/x-cmu-raster; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/svg+xml; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/vnd.wap.wbmp; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/targa; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 image/tga; geeqie '%s'; test=test -n "$DISPLAY" ; priority=7 debian/rules0000755000000000000000000000166312234420717010256 0ustar #!/usr/bin/make -f %: dh $@ --fail-missing --with autoreconf,autotools_dev # build simple version first # override_dh_auto_configure: dh_auto_configure -- \ --with-htmldir=/usr/share/doc/geeqie/html \ --with-readmedir=/usr/share/doc/geeqie/ \ --enable-lirc override_dh_auto_build: dh_auto_build convert geeqie.png -scale 32x32 geeqie.xpm override_dh_auto_install: mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/geeqie/html dh_auto_install rm -f \ $(CURDIR)/debian/tmp/usr/share/geeqie/template.desktop \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/README.lirc \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/ChangeLog \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/TODO \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/README \ $(CURDIR)/debian/tmp/usr/share/doc/geeqie/COPYING override_dh_compress: # Readme is shown from program, do not compress it dh_compress -XREADME override_dh_strip: dh_strip -a --dbg-package=geeqie-dbg debian/source/0000755000000000000000000000000012234420717010470 5ustar debian/source/format0000644000000000000000000000001412234420717011676 0ustar 3.0 (quilt) debian/source/include-binaries0000644000000000000000000000003112234420717013622 0ustar src/icons/icon_float.png