From a85e05fd4e699868d9db7e053f10ee5adf908df7 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 04:16:41 +0100 Subject: [PATCH 01/14] ci: add missing dependencies --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad72591..1e30173 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build: # - apt update && apt -y install make autoconf before_script: - DEBIAN_FRONTEND=noninteractive apt update - - DEBIAN_FRONTEND=noninteractive apt -y install autoconf automake zlib1g-dev libglib2.0-dev libxml2-dev gtk-doc-tools autopoint libtool libbz2-dev libgdk-pixbuf2.0-dev make + - DEBIAN_FRONTEND=noninteractive apt -y install autoconf autoconf-archive automake zlib1g-dev libglib2.0-dev libxml2-dev libbz2-dev gtk-doc-tools autopoint libtool libbz2-dev libgdk-pixbuf2.0-dev make libgirepository1.0-dev script: - ./autogen.sh --disable-dependency-tracking - make -- GitLab From c9c250a181738f63b3a64aebb5ba1c2ee0485d4f Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Thu, 12 Sep 2024 02:20:22 +0100 Subject: [PATCH 02/14] build: require GLib 2.62 Drop some redundant fallback paths --- README | 2 +- configure.ac | 32 +++++++++------------------ gsf/gsf-output-stdio.c | 20 +++-------------- gsf/gsf-timestamp.c | 50 +----------------------------------------- 4 files changed, 15 insertions(+), 89 deletions(-) diff --git a/README b/README index c3f5306..3c2a2cb 100644 --- a/README +++ b/README @@ -40,7 +40,7 @@ Requirements autoconf 2.5x automake 1.7 - glib >= 1.3.10 + glib >= 2.62 zlib >= 1.1.3 libxml2 >= 2.4.16 (not really, but it is the first to be tested) diff --git a/configure.ac b/configure.ac index bacaec1..793eae2 100644 --- a/configure.ac +++ b/configure.ac @@ -61,22 +61,18 @@ GETTEXT_PACKAGE=AC_PACKAGE_NAME AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) -dnl Checks for libraries. -ifelse([ - If we defined the module lists on the M4 level, we could have problems - with PKG_CHECK_MODULES from pkgconfig 0.16.0, which double quotes its - second argument (the module list). - As a handy workaround, we use shell variables. -]) dnl Modules required for libgsf -libgsf_reqs=" - gobject-2.0 >= 2.36.0 - glib-2.0 >= 2.36.0 - gio-2.0 >= 2.36.0 + +PKG_CHECK_MODULES(LIBGSF, [ + gobject-2.0 >= 2.62.0 + glib-2.0 >= 2.62.0 + gio-2.0 >= 2.62.0 libxml-2.0 >= 2.4.16 -" +]) + +AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, [GLIB_VERSION_2_62], [GLib symbol visibility]) +AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, [GLIB_VERSION_2_62], [GLib symbol visibility]) -PKG_CHECK_MODULES(LIBGSF, $libgsf_reqs) # GObject Introspection GIR_REQ=1.0.0 AC_ARG_ENABLE(introspection, @@ -300,20 +296,12 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( AC_DEFINE(HAVE_2ARG_STATFS, 1, [Define if you have two-argument statfs like linux])], [AC_MSG_RESULT([none, or unknown])]) -AC_CHECK_FUNCS(chown setrlimit gmtime_r gmtime) -AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,, -[#include ]) +AC_CHECK_FUNCS(chown setrlimit) SAVE_CFLAGS=$CFLAGS SAVE_LIBS=$LIBS CFLAGS="$CFLAGS $LIBGSF_CFLAGS" LIBS="$LIBGSF_LIBS $LIBS" -AC_MSG_CHECKING([for g_chown]) -AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], [[(void)g_chown("/xxx",-1,-1);]])], - [AC_DEFINE(HAVE_G_CHOWN, 1, [Define if g_chown is available as macro or function]) - AC_MSG_RESULT(yes)], - [AC_MSG_RESULT(no)]) -AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601) AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose) CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS diff --git a/gsf/gsf-output-stdio.c b/gsf/gsf-output-stdio.c index 7cb5196..818dcd0 100644 --- a/gsf/gsf-output-stdio.c +++ b/gsf/gsf-output-stdio.c @@ -108,18 +108,6 @@ unlink_and_retry: goto done; } -#ifdef HAVE_CHOWN -static int -chown_wrapper (const char *filename, uid_t owner, gid_t group) -{ -#ifdef HAVE_G_CHOWN - return g_chown (filename, owner, group); -#else - return chown (filename, owner, group); -#endif -} -#endif - #define GSF_MAX_LINK_LEVEL 256 /* Calls g_file_read_link() until we find a real filename. */ @@ -287,12 +275,10 @@ gsf_output_stdio_close (GsfOutput *output) */ g_chmod (stdio->real_filename, stdio->st.st_mode); #ifdef HAVE_CHOWN - if (chown_wrapper (stdio->real_filename, - stdio->st.st_uid, - stdio->st.st_gid)) { + if (chown (stdio->real_filename, stdio->st.st_uid, stdio->st.st_gid)) { /* We cannot set both. Maybe we can set one. */ - chown_wrapper (stdio->real_filename, -1, stdio->st.st_gid); - chown_wrapper (stdio->real_filename, stdio->st.st_uid, -1); + chown (stdio->real_filename, -1, stdio->st.st_gid); + chown (stdio->real_filename, stdio->st.st_uid, -1); } g_chmod (stdio->real_filename, stdio->st.st_mode); #endif diff --git a/gsf/gsf-timestamp.c b/gsf/gsf-timestamp.c index b9e6fd4..8265408 100644 --- a/gsf/gsf-timestamp.c +++ b/gsf/gsf-timestamp.c @@ -99,38 +99,12 @@ gsf_timestamp_free (GsfTimestamp *stamp) int gsf_timestamp_load_from_string (GsfTimestamp *stamp, char const *spec) { -#ifdef HAVE_G_DATE_TIME_NEW_FROM_ISO8601 GTimeZone *utc; -#else /*!HAVE_G_DATE_TIME_NEW_FROM_ISO8601*/ - guint year, month, day, hour, minute; - float second; -#endif /*HAVE_G_DATE_TIME_NEW_FROM_ISO8601*/ GDateTime *dt; -#ifdef HAVE_G_DATE_TIME_NEW_FROM_ISO8601 - /* Use g_date_time_new_from_iso8601 when GLib >= 2.56.0 */ utc = g_time_zone_new_utc (); dt = g_date_time_new_from_iso8601 (spec, utc); g_time_zone_unref (utc); -#else /*!HAVE_G_DATE_TIME_NEW_FROM_ISO8601*/ - /* 'YYYY-MM-DDThh:mm:ss' */ - if (6 != sscanf (spec, "%u-%u-%uT%u:%u:%f", - &year, &month, &day, &hour, &minute, &second)) - return FALSE; - - /* g_date_time_new_utc documentation says: */ - /* It not considered a programmer error for the values to this function to be out of range,*/ - /* but in the case that they are, the function will return NULL. */ - /* Nevertheless it seems to fail on values that are extremely out of range, see bug #702671 */ - if (second < 0.0 || second >= 60.0) - return FALSE; - if (minute > 59 || hour > 23) - return FALSE; - if (day > 32 || month > 12 || year > 9999) - return FALSE; - - dt = g_date_time_new_utc ((int)year, (int)month, (int)day, (int)hour, (int)minute, second); -#endif /*HAVE_G_DATE_TIME_NEW_FROM_ISO8601*/ if (!dt) return FALSE; @@ -187,18 +161,11 @@ gsf_timestamp_parse (char const *spec, GsfTimestamp *stamp) char * gsf_timestamp_as_string (GsfTimestamp const *stamp) { -#ifdef HAVE_G_DATE_TIME_FORMAT_ISO8601 GDateTime *dt; - gchar *iso8601_string; -#else /*!HAVE_G_DATE_TIME_FORMAT_ISO8601*/ - time_t t; - struct tm tm; -#endif /*HAVE_G_DATE_TIME_FORMAT_ISO8601*/ + char *iso8601_string; g_return_val_if_fail (stamp != NULL, g_strdup ("")); -#ifdef HAVE_G_DATE_TIME_FORMAT_ISO8601 - /* Use g_date_time_format_iso8601 when GLib >= 2.62.0 */ dt = g_date_time_new_from_unix_utc (stamp->timet); if (!dt) return g_strdup (""); @@ -207,21 +174,6 @@ gsf_timestamp_as_string (GsfTimestamp const *stamp) g_date_time_unref (dt); return iso8601_string; -#else /*!HAVE_G_DATE_TIME_FORMAT_ISO8601*/ - t = stamp->timet; /* Use an honest time_t for gmtime_r. */ -#ifdef HAVE_GMTIME_R - gmtime_r (&t, &tm); -#else -#warning "Using gmtime which is not thread safe -- perhaps upgrade glib" - /* -NOT- thread-safe */ - tm = *gmtime (&t); -#endif - - /* using 'YYYY-MM-DDThh:mm:ss' */ - return g_strdup_printf ("%4d-%02d-%02dT%02d:%02d:%02dZ", - tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, - tm.tm_hour, tm.tm_min, tm.tm_sec); -#endif /*HAVE_G_DATE_TIME_FORMAT_ISO8601*/ } guint -- GitLab From a3a79f491f29ad9384105e99f3d315908f02a9b1 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 01:53:21 +0100 Subject: [PATCH 03/14] readme: the mailing lists were shut down --- README | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/README b/README index 3c2a2cb..47fd631 100644 --- a/README +++ b/README @@ -43,16 +43,3 @@ Requirements glib >= 2.62 zlib >= 1.1.3 libxml2 >= 2.4.16 (not really, but it is the first to be tested) - -Mailing lists -------------- - - There is NO mailing list used to discuss libgsf specificly as yet. For now -please use the gnumeric list. To subscribe send a mail to: - - gnumeric-list-request@gnome.org -And in the body of the message write "subscribe" - -An archive of the mailing lists is available in: - http://mail.gnome.org/archives/gnumeric-list/ - -- GitLab From 9362909a73fab0cb004d9ac0bac29c0e3c6e074e Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Thu, 12 Sep 2024 02:26:10 +0100 Subject: [PATCH 04/14] build: drop deb/rpm definitions These are almost certainly hopelessly outdated --- .gitignore | 1 - Makefile.am | 1 - configure.ac | 1 - debian/.gitignore | 14 - debian/README | 10 - debian/changelog | 720 ------ debian/clean | 5 - debian/compat | 1 - debian/control | 85 - debian/copyright | 40 - debian/docs | 2 - debian/gir1.2-gsf-1.dirs | 1 - debian/gir1.2-gsf-1.install | 1 - debian/libgsf-1-114-dbg.dirs | 1 - debian/libgsf-1-114-dbg.install | 1 - debian/libgsf-1-114.dirs | 1 - debian/libgsf-1-114.install | 1 - debian/libgsf-1-114.symbols | 312 --- debian/libgsf-1-common.dirs | 1 - debian/libgsf-1-common.install | 1 - debian/libgsf-1-dev.dirs | 3 - debian/libgsf-1-dev.doc-base | 11 - debian/libgsf-1-dev.install | 6 - debian/libgsf-bin.dirs | 2 - debian/libgsf-bin.install | 7 - debian/libgsf-gnome-1-114-dbg.dirs | 1 - debian/libgsf-gnome-1-114-dbg.install | 1 - debian/libgsf-gnome-1-114.dirs | 1 - debian/libgsf-gnome-1-114.install | 1 - debian/libgsf-gnome-1-114.symbols | 13 - debian/libgsf-gnome-1-dev.dirs | 2 - debian/libgsf-gnome-1-dev.install | 4 - debian/patches/1eff4c3 | 482 ---- debian/patches/69bb2f0 | 176 -- debian/patches/afd9445 | 286 --- debian/patches/c248f5a | 266 --- debian/patches/df7ab90 | 541 ----- debian/patches/f7d0442 | 18 - .../refresh-config-sub-guess-1.14.26-1 | 2123 ----------------- debian/patches/series | 7 - debian/rules | 268 --- debian/source/format | 1 - debian/watch | 4 - libgsf-1.spec.in | 83 - 44 files changed, 5507 deletions(-) delete mode 100644 debian/.gitignore delete mode 100644 debian/README delete mode 100644 debian/changelog delete mode 100644 debian/clean delete mode 100644 debian/compat delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100644 debian/docs delete mode 100644 debian/gir1.2-gsf-1.dirs delete mode 100644 debian/gir1.2-gsf-1.install delete mode 100644 debian/libgsf-1-114-dbg.dirs delete mode 100644 debian/libgsf-1-114-dbg.install delete mode 100644 debian/libgsf-1-114.dirs delete mode 100644 debian/libgsf-1-114.install delete mode 100644 debian/libgsf-1-114.symbols delete mode 100644 debian/libgsf-1-common.dirs delete mode 100644 debian/libgsf-1-common.install delete mode 100644 debian/libgsf-1-dev.dirs delete mode 100644 debian/libgsf-1-dev.doc-base delete mode 100644 debian/libgsf-1-dev.install delete mode 100644 debian/libgsf-bin.dirs delete mode 100644 debian/libgsf-bin.install delete mode 100644 debian/libgsf-gnome-1-114-dbg.dirs delete mode 100644 debian/libgsf-gnome-1-114-dbg.install delete mode 100644 debian/libgsf-gnome-1-114.dirs delete mode 100644 debian/libgsf-gnome-1-114.install delete mode 100644 debian/libgsf-gnome-1-114.symbols delete mode 100644 debian/libgsf-gnome-1-dev.dirs delete mode 100644 debian/libgsf-gnome-1-dev.install delete mode 100644 debian/patches/1eff4c3 delete mode 100644 debian/patches/69bb2f0 delete mode 100644 debian/patches/afd9445 delete mode 100644 debian/patches/c248f5a delete mode 100644 debian/patches/df7ab90 delete mode 100644 debian/patches/f7d0442 delete mode 100644 debian/patches/refresh-config-sub-guess-1.14.26-1 delete mode 100644 debian/patches/series delete mode 100755 debian/rules delete mode 100644 debian/source/format delete mode 100644 debian/watch delete mode 100644 libgsf-1.spec.in diff --git a/.gitignore b/.gitignore index 26ea497..1d79447 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ config.status stamp-h* gsf-config.h.in gsf-config.h -libgsf-1.spec libgsf-1.pc libgsf-win32-1.pc libgsf-zip diff --git a/Makefile.am b/Makefile.am index d72e0f7..dc3d99a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,7 +10,6 @@ endif SUBDIRS = po gsf gsf-win32 doc tools tests thumbnailer python EXTRA_DIST = BUGS HACKING \ - libgsf-1.spec \ dumpdef.pl DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc \ diff --git a/configure.ac b/configure.ac index 793eae2..6957bbb 100644 --- a/configure.ac +++ b/configure.ac @@ -480,7 +480,6 @@ po/Makefile.in gsf/version.c doc/version.xml libgsf-1.pc -libgsf-1.spec libgsf-win32-1.pc libgsf-zip ]) diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 976ab67..0000000 --- a/debian/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -files -libgsf-1-114 -libgsf-1-114-dbg -libgsf-1-common -libgsf-1-dev -libgsf-bin -libgsf-gnome-1-114 -libgsf-gnome-1-114-dbg -libgsf-gnome-1-dev -tmp -*.pre*.debhelper -*.post*.debhelper -*.substvars -*.debhelper.log diff --git a/debian/README b/debian/README deleted file mode 100644 index 25143a9..0000000 --- a/debian/README +++ /dev/null @@ -1,10 +0,0 @@ -README for the GNOME Structured File Library -============================================ - -The API of this library may well still undergo some significant changes (in -particular, extensions). If you're considering using this library, please -participate in gnumeric-list [*] which is currently the appropriate forum -for libgsf discussions. - -[*] See http://mail.gnome.org/mailman/listinfo/gnumeric-list for - a subscription form and list archives. diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 99d05c4..0000000 --- a/debian/changelog +++ /dev/null @@ -1,720 +0,0 @@ -libgsf (1.14.26-1) unstable; urgency=low - - * New upstream release. - * [debian/patches/] Pick up post-release translation updates and - introspection fixes. - * [debian/libgsf-1-114.symbols] Update. - - -- J.H.M. Dassen (Ray) Mon, 04 Mar 2013 20:54:51 +0100 - -libgsf (1.14.25-2) unstable; urgency=medium - - * [debian/*] Fix introspection packaging. (Closes: #695599) - * Gir package name fix: gir1.2-libgsf-1 -> gir1.2-gsf-1 . - * Add runtime dependency of -dev on gir package. - * Added Conflicts:/Replaces: accordingly to ensure smooth upgrades. - * [debian/watch] Upstream has switched to .xz tarballs. - - -- J.H.M. Dassen (Ray) Wed, 19 Dec 2012 19:02:34 +0100 - -libgsf (1.14.25-1) unstable; urgency=low - - * New upstream release. (Closes: #678456) - * [debian/patches/po-from-git, debian/patches/series] Incorporate - post-release translation updates. - * [debian/rules] - * Really harden build. - * Drop "--with-gnome-vfs" and Gnome package related bits. - * Add "build-arch" and "build-indep" targets. - * Enable building with introspection. - * Fix docs installation. - * Put PHONY target declaration near target. - * [debian/control] - * Bonobo and gnome-vfs use was dropped upstream; drop build dependencies - and the Gnome packages accordingly. Update descriptions as well. - * Add libgirepository1.0-dev and gobject-introspection build - dependencies. - * Add introspection package. - * Remove VCS fields. (Closes: #676832) - * Updated Standards-Version. - * [debian/gir1.2-libgsf-1*] New. - * [debian/libgsf-bin.install] - * There are no gconf schemas to install any more. - * Install thumbnailer desktop entry. - * [debian/libgsf-1-dev.install, debian/libgsf-1-dev.dirs] Update. - * [debian/libgsf-1-114.symbols] Updated. - - -- J.H.M. Dassen (Ray) Sun, 18 Nov 2012 17:05:26 +0100 - -libgsf (1.14.21-2) unstable; urgency=low - - * [debian/control] Fix dependencies to allow binNMUs. Thanks Konstantinos - Margaritis . (Closes: #636189) - - -- J.H.M. Dassen (Ray) Sun, 28 Aug 2011 11:33:34 +0200 - -libgsf (1.14.21-1) unstable; urgency=low - - * New upstream release. - * [debian/copyright] Reworked. - * [debian/control] Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Sun, 22 May 2011 18:08:58 +0200 - -libgsf (1.14.20-1) unstable; urgency=low - - * New upstream release. - * [debian/patches/git-eb38dfc] Removed, integrated upstream. - - -- J.H.M. Dassen (Ray) Fri, 25 Mar 2011 08:32:52 +0100 - -libgsf (1.14.19-3) unstable; urgency=low - - * [debian/control, debian/rules] Harden build. - * [debian/patches/git-eb38dfc] Backport patch to address format issue - highlighted by hardened build. - - -- J.H.M. Dassen (Ray) Sat, 19 Feb 2011 11:43:59 +0100 - -libgsf (1.14.19-2) unstable; urgency=low - - * [debian/libgsf-1-114.symbols, debian/libgsf-gnome-1-114.symbols] New. - Symbols going back to lenny. - * [debian/rules] - * Default to strict dpkg-gensymbols checks. - * Generate a .pot file as requested for Ubuntu. (Closes: #587359) - - -- J.H.M. Dassen (Ray) Sat, 16 Oct 2010 12:36:48 +0200 - -libgsf (1.14.19-1) unstable; urgency=low - - * New upstream release. - * [debian/control] Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Sun, 26 Sep 2010 20:56:04 +0200 - -libgsf (1.14.18-1) unstable; urgency=low - - * New upstream release. - - -- J.H.M. Dassen (Ray) Thu, 08 Apr 2010 23:30:59 +0200 - -libgsf (1.14.17-1) unstable; urgency=low - - * New upstream release. - * [debian/source/format] Added - switch to source format 3.0 (quilt). - * [debian/control] Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Sun, 14 Feb 2010 16:37:02 +0100 - -libgsf (1.14.16-1) unstable; urgency=low - - * New upstream release. - * [debian/control] - * Added libglib2.0-doc build dependency to generate cross-references for - glib symbols. - * Added libgtk2.0-dev build dependency to have gsf-office-thumbnailer - be able to use gdk-pixbuf functions. - * Added libgsf-bin Suggests: imagemagick as gsf-office-thumbnailer may - try to use "convert". - - -- J.H.M. Dassen (Ray) Tue, 13 Oct 2009 21:30:58 +0200 - -libgsf (1.14.15-1) unstable; urgency=low - - * New upstream release. - * [debian/control] Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Sun, 21 Jun 2009 20:40:58 +0200 - -libgsf (1.14.14-1) unstable; urgency=low - - * New upstream release. - * [debian/control] - * Follow upstream VCS change: replaced Vcs-Svn by Vcs-git and updated - Vcs-Browser. - - -- J.H.M. Dassen (Ray) Sun, 24 May 2009 07:57:27 +0200 - -libgsf (1.14.13-1) unstable; urgency=low - - * New upstream release. - * This version is needed by Gnumeric 1.9.7 which has a high priority - bugfix; setting urgency accordingly. - * [debian/rules] Removed "--with-gnome" from confflags as it is no longer - a separate option for the configure script. - - -- J.H.M. Dassen (Ray) Thu, 07 May 2009 08:26:42 +0200 - -libgsf (1.14.12-1) unstable; urgency=low - - * New upstream release. - - -- J.H.M. Dassen (Ray) Sun, 26 Apr 2009 13:57:16 +0200 - -libgsf (1.14.11-3) unstable; urgency=medium - - * [debian/control] - * Dropped superfluous libgvfscommon-dev build dependency. - * Dropped -1 package revision from libxml2-dev build dependency. - * Updated section of the debug packages. - * Have all packages depend on ${misc:Depends}. - * Replaced deprecated ${Source-Version} by ${binary:Version}. - * Updated Standards-Version. - * [debian/rules] Don't ignore errors on make distclean. - - -- J.H.M. Dassen (Ray) Mon, 06 Apr 2009 20:28:58 +0200 - -libgsf (1.14.11-2) unstable; urgency=high - - * [gsf/gsf-output-csv.c, ChangeLog] Backport fix for a code issue which - caused FTBFS in some environments. (Closes: #513594) - - -- J.H.M. Dassen (Ray) Fri, 30 Jan 2009 18:21:17 +0100 - -libgsf (1.14.11-1) unstable; urgency=low - - * New upstream release. - - -- J.H.M. Dassen (Ray) Thu, 08 Jan 2009 11:55:29 +0100 - -libgsf (1.14.10-3) unstable; urgency=low - - * [gsf/gsf-utils.c] Natural endian doubles aren't just used on VFP enabled - ARM, but on ARM with EABI as well. Adjust the logic for defining - G_FLOAT_BYTE_ORDER accordingly. Patch courtesy of Riku Voipio - . (Closes: #503144) - - -- J.H.M. Dassen (Ray) Thu, 23 Oct 2008 19:55:22 +0200 - -libgsf (1.14.10-2) unstable; urgency=low - - * [debian/rules] Reenable use of gnomevfs as the oldlibs version of goffice - relies on it. (Closes: #502971) - - -- J.H.M. Dassen (Ray) Wed, 22 Oct 2008 19:13:50 +0200 - -libgsf (1.14.10-1) unstable; urgency=low - - * New upstream release. - * [debian/control] - * Updated Standards-Version. - * Added explicit build dependency on zlib1g-dev. - - -- J.H.M. Dassen (Ray) Sun, 19 Oct 2008 17:18:56 +0200 - -libgsf (1.14.9-1) unstable; urgency=low - - * New upstream release. - * [debian/clean] New. - * [debian/rules] - * Removed some cleanup that's now handled by debian/clean. - * Use "dh_prep" instead of "dh_clean -k". - * [debian/rules, debian/control] - * Enable gio support; bumped glib build and runtime dependencies - accordingly. - * Explicitly disable use of gnomevfs - use gio's implementation instead. - * Moved gtk-doc symlink from libgsf-gnome-1-dev to libgsf-1-dev. - * [debian/compat] Update to v7. - * [debian/control] - * Fix dependencies of libgsf-1-114-dbg. - * Removed duplicate words. - * Updated debhelper build dependency. - * [debian/libgsf-bin.install] Add gsf-vba-dump manual page (new). - * [debian/libgsf-gnome-1-dev.install] Remove pattern that was not used. - - -- J.H.M. Dassen (Ray) Sat, 30 Aug 2008 15:50:04 +0200 - -libgsf (1.14.8-1lenny1) testing; urgency=medium - - * Fix silent data corruption bug - http://bugzilla.gnome.org/show_bug.cgi?id=350973: - Gnumeric's import and export of floating point constants in xls files - was broken on Nokia 770 / armel: - [gsf/gsf-utils.c] - * Natural endian doubles aren't just used on VFP enabled ARM, but on - ARM with EABI as well. Adjust the logic for defining - G_FLOAT_BYTE_ORDER accordingly. Patch courtesy of Riku Voipio - . (Closes: #503144) - * Add self-check code for decoding of little endian doubles, taken from - newer upstream releases. - - -- J.H.M. Dassen (Ray) Mon, 27 Oct 2008 19:26:55 +0100 - -libgsf (1.14.8-1) unstable; urgency=low - - * New upstream release. - * [debian/rules] No longer exclude win32.h on dh_install; upstream now only - tries to install it on win32 platforms. - * [debian/control] - * Bumped debhelper build dependency to match compatibility level - specified in debian/compat. - * Updated Standards-Version. - * [doc/gsf-office-thumbnailer.1, doc/gsf.1] Fixed lintian warnings: - corrected font reference and switched to .URL for hyperlinks. - * [debian/libgsf-1-dev.doc-base] Changed section to fit in the new section - hierarchy. - - -- J.H.M. Dassen (Ray) Thu, 06 Mar 2008 07:57:05 +0100 - -libgsf (1.14.7-2) unstable; urgency=low - - * [debian/control] - * Fixed a syntax error which was ignored by dpkg until recently. - * Added Vcs-Svn, Vcs-Browser. - * [debian/rules] Changed the way in which LDFLAGS are passed so - -Wl,--as-needed has much greater effect. - * [debian/watch] Updated. - - -- J.H.M. Dassen (Ray) Sun, 25 Nov 2007 14:29:33 +0100 - -libgsf (1.14.7-1) unstable; urgency=medium - - * New upstream bugfix release. - - -- J.H.M. Dassen (Ray) Fri, 07 Sep 2007 20:31:29 +0200 - -libgsf (1.14.6-1) unstable; urgency=low - - * New upstream release. - * [debian/libgsf-gnome-1-dev.install] Added gsf-gvfs includes. - - -- J.H.M. Dassen (Ray) Tue, 04 Sep 2007 18:57:39 +0200 - -libgsf (1.14.5-1) unstable; urgency=medium - - * New upstream release. Changes include: - * Revert jump to dynamic types, they aren't threadsafe. [gnome #450722] - (Closes: #431104) - * [debian/rules] Ensure the symlinks for -dbg documentation are only - included in the -dbg packages. (Closes: #429900) - * [configure] Regenerated as the upstream version accidentally included an - unexpanded macro. - - -- J.H.M. Dassen (Ray) Wed, 11 Jul 2007 19:56:46 +0200 - -libgsf (1.14.4-1) unstable; urgency=low - - * New upstream release. - * [debian/control] Bump glib build dependency as per configure.in . - * [debian/rules] Build arch independent package in binary-indep; general - overhaul. - - -- J.H.M. Dassen (Ray) Tue, 19 Jun 2007 06:51:04 +0200 - -libgsf (1.14.3-1) unstable; urgency=medium - - * New upstream release. - - -- J.H.M. Dassen (Ray) Mon, 6 Nov 2006 22:45:03 +0100 - -libgsf (1.14.2-1) unstable; urgency=high - - * New upstream release. Urgency high as this includes a fix for a security - vulnerability, [IDEF1622]. - * [debian/rules] Explicitly disable Python support. - * [debian/libgsf-bin.install] Updated. - * [debian/control] Updated description of libgsf-bin. - - -- J.H.M. Dassen (Ray) Tue, 3 Oct 2006 18:38:37 +0200 - -libgsf (1.14.1-2) unstable; urgency=low - - * [debian/libgsf-1-dev.install, debian/libgsf-gnome-1-dev.install, - debian/rules] No longer include the .la files. - * [debian/control] Bumped Standards-Version (no changes needed). - - -- J.H.M. Dassen (Ray) Thu, 22 Jun 2006 22:36:12 +0200 - -libgsf (1.14.1-1) unstable; urgency=low - - * New upstream bugfix release. - * [debian/control] Bumped Standards-Version. - - -- J.H.M. Dassen (Ray) Mon, 8 May 2006 23:20:29 +0200 - -libgsf (1.14.0-1) unstable; urgency=low - - * New upstream release. - * [debian/rules] Restructured to make it easy to build "oldlibs" packages - should they be needed. - * [debian/watch] Updated. - - -- J.H.M. Dassen (Ray) Thu, 2 Mar 2006 07:05:51 +0100 - -libgsf (1.13.3-1) unstable; urgency=medium - - * New upstream release; limited changes. - * [debian/watch] Updated. - - -- J.H.M. Dassen (Ray) Mon, 7 Nov 2005 06:52:45 +0100 - -libgsf (1.13.2-2) unstable; urgency=low - - * Upload to unstable. - - -- J.H.M. Dassen (Ray) Tue, 1 Nov 2005 18:54:14 +0100 - -libgsf (1.13.2-1) experimental; urgency=low - - * New upstream release. Library versioning is now separate from the - versioning of gsf as a whole. - * Package renames, reorganisation to take advantage of proper library - versioning. - * Upload to experimental for now; there are to still too many library - transitions happening currently. - * [debian/control] Bumped Standards-Version. - * [debian/rules] Link --as-needed. - - -- J.H.M. Dassen (Ray) Mon, 10 Oct 2005 19:22:14 +0200 - -libgsf (1.12.3-4) unstable; urgency=medium - - * [debian/control, debian/libgsf-1.install, debian/libgsf-gnome-1.install, - debian/libgsf-1.dirs, debian/libgsf-gnome-1.dirs] - Move gsf-office-thumbnailer into libgsf-gnome-1 as some people seem to - believe having gconf installed on their system will bring about the end - of life as we know it. (Closes: #328371) - - -- J.H.M. Dassen (Ray) Thu, 22 Sep 2005 19:12:41 +0200 - -libgsf (1.12.3-3) unstable; urgency=low - - * Upload to unstable now that 1.12.2-1 has made it into testing. - - -- J.H.M. Dassen (Ray) Wed, 14 Sep 2005 07:09:10 +0200 - -libgsf (1.12.3-2) experimental; urgency=medium - - * [debian/control] Added libgsf-1 Depends: ${misc:Depends} to get the gconf2 - dependency needed to install gsf-office-thumbnailer's schemas. - (Closes: #327760) - - -- J.H.M. Dassen (Ray) Mon, 12 Sep 2005 18:40:47 +0200 - -libgsf (1.12.3-1) experimental; urgency=low - - * New upstream bugfix release. - * Upload to experimental for now, so as not to interfere with the GNOME - transition for etch. - * [debian/libgsf-1.install, debian/libgsf-1.dirs, debian/rules] Include - gsf-office-thumbnailer helper binary and its support files. - * [debian/watch] Updated. - - -- J.H.M. Dassen (Ray) Thu, 8 Sep 2005 18:46:03 +0200 - -libgsf (1.12.2-1) unstable; urgency=high - - * New upstream release. - * [debian/rules] Dropped "--enable-iso-c". - * [debian/copyright] Updated. - * [debian/control] The libgsf API for metadata was changed in 1.12 without a - corresponding soname change. This broke saving in Excel format for older - versions of gnumeric but caused no other reported breakage. Added a - Conflicts: to handle this. (A renaming of the library package would force - rebuilds of a large number of packages that are otherwise not affected by - this API change). (Closes: #316096) - - -- J.H.M. Dassen (Ray) Tue, 16 Aug 2005 09:39:56 +0200 - -libgsf (1.12.1-1) unstable; urgency=low - - * New upstream release. - - -- J.H.M. Dassen (Ray) Mon, 13 Jun 2005 07:04:14 +0200 - -libgsf (1.12.0-1) unstable; urgency=low - - * New upstream release - * [debian/control] Updated glib build dependencies per configure.in. - - -- J.H.M. Dassen (Ray) Tue, 10 May 2005 14:08:14 +0200 - -libgsf (1.11.1-1) unstable; urgency=medium - - * New upstream release. - - -- J.H.M. Dassen (Ray) Mon, 6 Dec 2004 19:48:31 +0100 - -libgsf (1.11.0-1) unstable; urgency=medium - - * New upstream release. - - -- J.H.M. Dassen (Ray) Mon, 29 Nov 2004 14:43:07 +0100 - -libgsf (1.10.1-1) unstable; urgency=high - - * New upstream bugfix release. XLS files larger than 6.8 MB written by - gnumeric using older libgsf were corrupted by Excel. - - -- J.H.M. Dassen (Ray) Fri, 20 Aug 2004 21:43:56 +0200 - -libgsf (1.10.0-4) unstable; urgency=medium - - * [debian/rules] Corrected documentation symlink to make the API docs - accessible through devhelp. - * [config.guess, config.sub] Updated. - - -- J.H.M. Dassen (Ray) Sat, 14 Aug 2004 21:50:14 +0200 - -libgsf (1.10.0-3) unstable; urgency=low - - * [debian/watch] Added. - * [debian/libgsf-1-dev.doc-base] Corrected documentation location. - (Closes: #262912) - - -- J.H.M. Dassen (Ray) Tue, 3 Aug 2004 19:15:22 +0200 - -libgsf (1.10.0-2) unstable; urgency=low - - * Upload to unstable. - * [configure.in] Patch (already in upstream CVS) to fix symbol resolution - issues. - * Relibtoolised/auto*ed. - - -- J.H.M. Dassen (Ray) Tue, 13 Jul 2004 17:42:43 +0200 - -libgsf (1.10.0-1) experimental; urgency=low - - * New upstream release. - * Upload to experimental for now, so as not to interfere with the cupsys - transition for sarge. - - -- J.H.M. Dassen (Ray) Mon, 5 Jul 2004 20:39:27 +0200 - -libgsf (1.9.1-6) unstable; urgency=high - - * [debian/control] Readded libgsf-1-dev Depends: libbz2-dev as libgsf-1.la - has `-lbz2' in dependency_libs. - - -- J.H.M. Dassen (Ray) Sun, 13 Jun 2004 13:57:29 +0200 - -libgsf (1.9.1-5) unstable; urgency=medium - - * [debian/control] Dependencies overhaul. - * Added libgsf-1-dev Depends: libxml2-dev. (Closes: #253013) - * Added libgsf-1-dev Depends: libglib2.0-dev (as per libgsf-1.pc). - * Added libgsf-1-dev, libgsf-gnome-1-dev Recommends: pkg-config as - pkg-config is the recommended way of obtaining appropriate compilation - and linking flags. - * Removed libgsf-1-dev Depends: libbz2-dev as neither include files nor - the .pc file refer to it, making the libbz dependency completely - contained within the runtime library. - * [NEWS,ChangeLog,gsf/gsf-infile-msole.c,gsf/gsf-outfile-stdio.c,gsf-gnome/gsf-input-gnomevfs.c] - Pick up more minor bugfixes from CVS. - - -- J.H.M. Dassen (Ray) Sun, 6 Jun 2004 18:24:25 +0200 - -libgsf (1.9.1-4) unstable; urgency=low - - * [debian/control] Tightened build dependencies; rebuild against GNOME 2.6 - libraries. - - -- J.H.M. Dassen (Ray) Wed, 26 May 2004 08:59:45 +0200 - -libgsf (1.9.1-3) unstable; urgency=high - - * [gsf/gsf-utils.c] Updated patch from CVS as the previous one wasn't - enough; it FTBFS on ARM. - - -- J.H.M. Dassen (Ray) Fri, 21 May 2004 21:24:18 +0200 - -libgsf (1.9.1-2) unstable; urgency=high - - * [gsf/gsf-utils.c] Applied patch from CVS to deal with ARM's "mixed-endian" - storage of doubles. (Closes: #250249) - - -- J.H.M. Dassen (Ray) Fri, 21 May 2004 18:12:13 +0200 - -libgsf (1.9.1-1) unstable; urgency=medium - - * New upstream release. - * [debian/control] Remove workaround dependency on openjade and bumped - gtk-doc-tools dependency. - - -- J.H.M. Dassen (Ray) Sun, 16 May 2004 22:02:03 +0200 - -libgsf (1.9.0-1) unstable; urgency=medium - - * New upstream release. - * [debian/libgsf-1-dev.install] Follow documentation changes. - * [debian/rules] Take advantage of some linker features. - Include a /usr/share/gtk-doc/html/gsf symlink to the docs. - * [debian/control] Add a dependency on openjade to work around - gtk-doc-tools' incomplete dependencies. - - -- J.H.M. Dassen (Ray) Thu, 6 May 2004 19:47:45 +0200 - -libgsf (1.8.2-6) unstable; urgency=low - - * [doc/Makefile.am] Patch from CVS to fix one of the two jade complaints - about the SGML documentation. - * [configure.in] Patch from CVS to improve fdopen detection. - * [gsf/gsf-libxml.c] Updated from CVS. - - -- J.H.M. Dassen (Ray) Thu, 5 Feb 2004 20:08:12 +0100 - -libgsf (1.8.2-5) unstable; urgency=medium - - * [debian/control] Pass along -Wl,-z,defs through LDFLAGS rather than - CFLAGS. - - -- J.H.M. Dassen (Ray) Fri, 7 Nov 2003 08:06:11 +0100 - -libgsf (1.8.2-4) unstable; urgency=medium - - * [debian/control] Really pass along CFLAGS; added -Wl,-z,defs to catch - incomplete shared library dependency information at build time. - * [debian/control, debian/rules, debian/*-dbg*] Produce -dbg packages as - well. - - -- J.H.M. Dassen (Ray) Sat, 25 Oct 2003 16:36:43 +0200 - -libgsf (1.8.2-3) unstable; urgency=medium - - * [debian/control] Tightened libgnomevfs2-dev build dependency so as not to - run into problems with liblinc. - - -- J.H.M. Dassen (Ray) Sat, 18 Oct 2003 17:02:58 +0200 - -libgsf (1.8.2-2) unstable; urgency=medium - - * [debian/control] Versioned the libbonobo2-dev so as not to depend on the - bonobo-activation packages which are being phased out (as - bonobo-activiation has been rolled into bonobo). - * [config.guess, config.sub] Updated. - - -- J.H.M. Dassen (Ray) Sat, 18 Oct 2003 15:01:49 +0200 - -libgsf (1.8.2-1) unstable; urgency=medium - - * New upstream release. - * [debian/control] Updated Standards-Version. - * [debian/control, debian/rules] Use dh_buildinfo. - - -- J.H.M. Dassen (Ray) Sat, 13 Sep 2003 12:10:50 +0200 - -libgsf (1.8.1-4) unstable; urgency=high - - * [debian/control] Upped the gtk-doc-tools build dependency to hopefully - finally build again on all architectures. - - -- J.H.M. Dassen (Ray) Sat, 28 Jun 2003 21:30:59 +0200 - -libgsf (1.8.1-3) unstable; urgency=high - - * Revert the jade changes from -2 now that m68k's jade issue is fixed. - * [debian/control] Versioned the gtk-doc-tools build dependency to ensure we - can build the docs on all architectures. - - -- J.H.M. Dassen (Ray) Thu, 19 Jun 2003 21:12:53 +0200 - -libgsf (1.8.1-2) unstable; urgency=high - - * Try to work around a Jade bus error on m68k (#196730) by using OpenJade - instead. - * [doc/gtkdoc-mkhtml] New; based on the one from gtk-doc-tools 1.0-4. - Changed to use OpenJade rather than Jade. - * [debian/rules] Make doc/gtkdoc-mkhtml executable. - * [doc/Makefile.am] Use local gtkdoc-mkhtml. - * [debian/control] Added OpenJade build dependency. - * [debian/control] Put libgsf-1-dev and libgsf-gnome-1-dev in section - `libdevel'. - - -- J.H.M. Dassen (Ray) Mon, 16 Jun 2003 08:53:07 +0200 - -libgsf (1.8.1-1) unstable; urgency=medium - - * New upstream release. - * Updated debianisation: switched from dh_movefiles to dh_install. - * Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Sun, 8 Jun 2003 11:33:24 +0200 - -libgsf (1.8.0-3) unstable; urgency=medium - - * [gsf/Makefile.am] Extended libgsf_1_la_LIBADD for proper inter-library - dependensies. - - -- J.H.M. Dassen (Ray) Wed, 14 May 2003 21:43:04 +0200 - -libgsf (1.8.0-2) unstable; urgency=low - - * [debian/control] Added libgsf-1-dev Depends: libbz2-dev. - - -- J.H.M. Dassen (Ray) Mon, 12 May 2003 18:30:09 +0200 - -libgsf (1.8.0-1) unstable; urgency=low - - * New upstream release. - * [debian/copyright] Follow upstream license change from GPL to LGPL. - * [debian/control] - * Added build dependency on libbz2-dev. - * Updated Standards-Version. - * [debian/rules] Build with bzip2 support. - - -- J.H.M. Dassen (Ray) Mon, 12 May 2003 10:08:14 +0200 - -libgsf (1.7.2-2) unstable; urgency=medium - - * [gsf/gsf-outfile-msole.h, gsf/gsf-outfile-msole.c] At upstream's - suggestion, applied ole export patch which will be in 1.8.0. - - -- J.H.M. Dassen (Ray) Thu, 6 Feb 2003 23:15:21 +0100 - -libgsf (1.7.2-1) unstable; urgency=low - - * New upstream release. - * [debian/copyright] Updated. - * [debian/rules] Clean out generated documentation. - - -- J.H.M. Dassen (Ray) Tue, 28 Jan 2003 08:27:58 +0100 - -libgsf (1.6.0-1) unstable; urgency=low - - * New upstream release. - * Updated Standards-Version. - - -- J.H.M. Dassen (Ray) Thu, 19 Dec 2002 22:50:49 +0100 - -libgsf (1.5.0-2) unstable; urgency=low - - * Upload to unstable after consulting upstream. - * [debian/control, debian/README] Put in some notes regarding API stability. - - -- J.H.M. Dassen (Ray) Fri, 15 Nov 2002 08:23:30 +0100 - -libgsf (1.5.0-1) experimental; urgency=low - - * New upstream release. - * [debian/rules] Reworked so we don't need a shlibs.local . - - -- J.H.M. Dassen (Ray) Sat, 26 Oct 2002 23:03:22 +0200 - -libgsf (1.4.0-1) experimental; urgency=low - - * New upstream release. - * Tighten dependency in shlibs to >= upstream version. - * Updated shlibs.local. - * Changed DEB_BUILD_OPTIONS handling and updated Standards-Version. - - -- J.H.M. Dassen (Ray) Thu, 19 Sep 2002 22:56:15 +0200 - -libgsf (1.3.0-1) experimental; urgency=low - - * New upstream release, splitting GNOME-specific parts of into a separate - library (so the base library can be used in non-GNOME projects). - * Tightened build dependencies. - * Used libtool package patched with the "inst-prefix" patch (see #57087) - to produce an ltmain.sh that deals with un-installed shared libraries - properly, so we can produce working libgsf-gnome-1(-dev) packages. - - -- J.H.M. Dassen (Ray) Tue, 27 Aug 2002 15:53:22 +0200 - -libgsf (1.2.0-1) experimental; urgency=low - - * Initial Debian packaging. (Closes: #149355) - * Consulted upstream and decided to have this in experimental for now as - major changes are still expected. - - -- J.H.M. Dassen (Ray) Tue, 13 Aug 2002 18:54:45 +0200 diff --git a/debian/clean b/debian/clean deleted file mode 100644 index b610195..0000000 --- a/debian/clean +++ /dev/null @@ -1,5 +0,0 @@ -build -config.cache -config.status -doc/html/*.png -doc/html/*.html diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index 4cc289e..0000000 --- a/debian/control +++ /dev/null @@ -1,85 +0,0 @@ -Source: libgsf -Section: libs -Priority: optional -Maintainer: J.H.M. Dassen (Ray) -Build-Depends: debhelper (>= 7.0.0), dh-buildinfo, hardening-includes, - gtk-doc-tools (>= 1.2-1.2), - libglib2.0-dev (>= 2.16.1), libglib2.0-doc, libxml2-dev (>= 2.6.10), - libgtk2.0-dev, libbz2-dev, zlib1g-dev, - gobject-introspection, libgirepository1.0-dev -Standards-Version: 3.9.4 - -Package: libgsf-1-114-dbg -Section: debug -Priority: extra -Architecture: any -Depends: libgsf-1-114 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} -Description: Structured File Library - debugging files (basic version) - This package contains the files for debugging (applications that use the) - the core parts of the GNOME Structured File Library. - -Package: libgsf-1-dev -Section: libdevel -Architecture: any -Depends: libgsf-1-114 (= ${binary:Version}), gir1.2-gsf-1 (= ${binary:Version}), libglib2.0-dev (>= 2.16.1), libxml2-dev (>= 2.6.10-1), libbz2-dev, ${misc:Depends} -Conflicts: gir1.2-libgsf-1 -Replaces: libgsf-gnome-1-dev (<= 1.14.8-1), gir1.2-libgsf-1 -Recommends: pkg-config -Description: Structured File Library - development files - This package contains the development files used in building applications - that use the GNOME Structured File Library. - . - The GNOME Structured File Library aims to provide an efficient - extensible I/O abstraction for dealing with different structured file - formats. It is actively being developed and its API is still likely to - undergo significant changes (in particular, extensions). - -Package: gir1.2-gsf-1 -Section: introspection -Architecture: any -Conflicts: gir1.2-libgsf-1 -Replaces: gir1.2-libgsf-1 -Depends: ${gir:Depends}, ${misc:Depends} -Description: GObject introspection data for the Structured File Library - This package contains introspection data for the Structured File Library. - . - It can be used by packages using the GIRepository format to generate - dynamic bindings. - -Package: libgsf-1-114 -Section: libs -Architecture: any -Depends: libgsf-1-common (>= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} -Conflicts: gnumeric (<< 1.4.4) -Description: Structured File Library - runtime version - The GNOME Structured File Library aims to provide an efficient - extensible I/O abstraction for dealing with different structured file - formats. - -Package: libgsf-1-common -Section: libs -Architecture: all -Depends: ${misc:Depends} -Replaces: libgsf-1 (<= 1.12.3-4) -Description: Structured File Library - common files - The GNOME Structured File Library aims to provide an efficient - extensible I/O abstraction for dealing with different structured file - formats. - . - These are the architecture independent files that are part of libgsf, - like translations of messages. - -Package: libgsf-bin -Section: gnome -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: imagemagick -Replaces: libgsf-1 (<= 1.12.3-3), libgsf-gnome-1 (<= 1.12.3-4) -Description: Structured File Library - programs - The GNOME Structured File Library aims to provide an efficient - extensible I/O abstraction for dealing with different structured file - formats. - . - These are the programs that are shipped as part of libgsf. They include - a thumbnail generator, a tar-like archiver application and a VBA macro - extractor. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 2e09bbd..0000000 --- a/debian/copyright +++ /dev/null @@ -1,40 +0,0 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=54 -Upstream-Name: libgsf -- The G Structured File Library -Upstream-Contact: gnumeric-list@lists.gnome.org -Source: http://ftp.gnome.org/pub/GNOME/sources/libgsf/ - -Files: * -Copyright: 2000 Ximian Inc. - 2002-2006 Dom Lachowicz (cinamod@hotmail.com) - 2002-2008 Jody Goldberg (jody@gnome.org) - 2002-2006 Jon K Hellan (hellan@acm.org) - 2002-2003 Michael Meeks (michael.meeks@novell.com) - 2002-2006 Morten Welinder (terra@diku.dk) - 2002-2006 Tambet Ingo (tambet@ximian.com) - 2003-2006 Rodrigo Moya (rodrigo@gnome-db.org) - 2004-2006 Frank Chiulli (fc-linux@cox.net) - 2004-2006 Novell, Inc. - 2005-2006 INdT - Instituto Nokia de Tecnologia - 2006 Michael Lawrence (lawremi@iastate.edu) -License: LGPL-2.1-only - This library is free software; you can redistribute it and/or modify - it under the terms of version 2.1 of the GNU Lesser General Public - License as published by the Free Software Foundation. - . - This program 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 with the Debian GNU/Linux distribution in the file - /usr/share/common-licenses/LGPL-2.1; 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.1'. - - -This package was debianized by J.H.M. Dassen (Ray) on -Thu, 23 May 2002 15:59:34 +0200. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 50bd824..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -NEWS -README diff --git a/debian/gir1.2-gsf-1.dirs b/debian/gir1.2-gsf-1.dirs deleted file mode 100644 index 75f1a9b..0000000 --- a/debian/gir1.2-gsf-1.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib/girepository-1.0 diff --git a/debian/gir1.2-gsf-1.install b/debian/gir1.2-gsf-1.install deleted file mode 100644 index 7625055..0000000 --- a/debian/gir1.2-gsf-1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/girepository-*/Gsf-*.typelib diff --git a/debian/libgsf-1-114-dbg.dirs b/debian/libgsf-1-114-dbg.dirs deleted file mode 100644 index 1acc2ff..0000000 --- a/debian/libgsf-1-114-dbg.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/debug diff --git a/debian/libgsf-1-114-dbg.install b/debian/libgsf-1-114-dbg.install deleted file mode 100644 index a619606..0000000 --- a/debian/libgsf-1-114-dbg.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/debug/libgsf-1.so* diff --git a/debian/libgsf-1-114.dirs b/debian/libgsf-1-114.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libgsf-1-114.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libgsf-1-114.install b/debian/libgsf-1-114.install deleted file mode 100644 index 731c798..0000000 --- a/debian/libgsf-1-114.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libgsf-1.so.* diff --git a/debian/libgsf-1-114.symbols b/debian/libgsf-1-114.symbols deleted file mode 100644 index 0ba9407..0000000 --- a/debian/libgsf-1-114.symbols +++ /dev/null @@ -1,312 +0,0 @@ -libgsf-1.so.114 libgsf-1-114 #MINVER# - get_gsf_odf_version@Base 1.14.15 - get_gsf_odf_version_string@Base 1.14.15 - get_gsf_ooo_ns@Base 1.14.15 - gsf_base64_decode_simple@Base 1.14.8 - gsf_base64_decode_step@Base 1.14.8 - gsf_base64_encode_close@Base 1.14.8 - gsf_base64_encode_simple@Base 1.14.8 - gsf_base64_encode_step@Base 1.14.8 - gsf_blob_get_size@Base 1.14.8 - gsf_blob_get_type@Base 1.14.8 - gsf_blob_new@Base 1.14.8 - gsf_blob_peek_data@Base 1.14.8 - gsf_clip_data_get_data_blob@Base 1.14.8 - gsf_clip_data_get_format@Base 1.14.8 - gsf_clip_data_get_type@Base 1.14.8 - gsf_clip_data_get_windows_clipboard_format@Base 1.14.8 - gsf_clip_data_new@Base 1.14.8 - gsf_clip_data_peek_real_data@Base 1.14.8 - gsf_debug_flag@Base 1.14.19 - gsf_doc_meta_data_foreach@Base 1.14.8 - gsf_doc_meta_data_get_type@Base 1.14.8 - gsf_doc_meta_data_insert@Base 1.14.8 - gsf_doc_meta_data_lookup@Base 1.14.8 - gsf_doc_meta_data_new@Base 1.14.8 - gsf_doc_meta_data_odf_subtree@Base 1.14.24 - gsf_doc_meta_data_read_from_msole@Base 1.14.24 - gsf_doc_meta_data_read_from_odf@Base 1.14.24 - gsf_doc_meta_data_remove@Base 1.14.8 - gsf_doc_meta_data_size@Base 1.14.8 - gsf_doc_meta_data_steal@Base 1.14.8 - gsf_doc_meta_data_store@Base 1.14.8 - gsf_doc_meta_data_write_to_msole@Base 1.14.24 - gsf_doc_meta_data_write_to_odf@Base 1.14.24 - gsf_doc_meta_dump@Base 1.14.8 - gsf_doc_prop_dump@Base 1.14.8 - gsf_doc_prop_free@Base 1.14.8 - gsf_doc_prop_get_link@Base 1.14.8 - gsf_doc_prop_get_name@Base 1.14.8 - gsf_doc_prop_get_type@Base 1.14.24 - gsf_doc_prop_get_val@Base 1.14.8 - gsf_doc_prop_new@Base 1.14.8 - gsf_doc_prop_set_link@Base 1.14.8 - gsf_doc_prop_set_val@Base 1.14.8 - gsf_doc_prop_swap_val@Base 1.14.8 - gsf_docprop_vector_append@Base 1.14.8 - gsf_docprop_vector_as_string@Base 1.14.8 - gsf_docprop_vector_get_type@Base 1.14.8 - gsf_docprop_vector_new@Base 1.14.8 - gsf_error_quark@Base 1.14.8 - gsf_extension_pointer@Base 1.14.8 - gsf_filename_to_utf8@Base 1.14.8 - gsf_iconv_close@Base 1.14.8 - gsf_infile_child_by_aname@Base 1.14.9 - gsf_infile_child_by_index@Base 1.14.8 - gsf_infile_child_by_name@Base 1.14.8 - gsf_infile_child_by_vaname@Base 1.14.9 - gsf_infile_child_by_vname@Base 1.14.8 - gsf_infile_get_type@Base 1.14.8 - gsf_infile_msole_get_class_id@Base 1.14.8 - gsf_infile_msole_get_type@Base 1.14.8 - gsf_infile_msole_new@Base 1.14.8 - gsf_infile_msvba_get_modules@Base 1.14.9 - gsf_infile_msvba_get_type@Base 1.14.8 - gsf_infile_msvba_new@Base 1.14.8 - gsf_infile_msvba_steal_modules@Base 1.14.9 - gsf_infile_name_by_index@Base 1.14.8 - gsf_infile_num_children@Base 1.14.8 - gsf_infile_stdio_get_type@Base 1.14.8 - gsf_infile_stdio_new@Base 1.14.8 - gsf_infile_tar_get_type@Base 1.14.10 - gsf_infile_tar_new@Base 1.14.10 - gsf_infile_zip_get_type@Base 1.14.8 - gsf_infile_zip_new@Base 1.14.8 - gsf_init@Base 1.14.8 - gsf_init_dynamic@Base 1.14.8 - gsf_input_container@Base 1.14.8 - gsf_input_copy@Base 1.14.8 - gsf_input_dump@Base 1.14.8 - gsf_input_dup@Base 1.14.8 - gsf_input_eof@Base 1.14.8 - gsf_input_error@Base 1.14.8 - gsf_input_error_id@Base 1.14.8 - gsf_input_find_vba@Base 1.14.9 - gsf_input_get_type@Base 1.14.8 - gsf_input_gio_get_type@Base 1.14.9 - gsf_input_gio_new@Base 1.14.9 - gsf_input_gio_new_for_path@Base 1.14.9 - gsf_input_gio_new_for_uri@Base 1.14.9 - gsf_input_gzip_get_type@Base 1.14.8 - gsf_input_gzip_new@Base 1.14.8 - gsf_input_http_get_content_type@Base 1.14.8 - gsf_input_http_get_type@Base 1.14.8 - gsf_input_http_get_url@Base 1.14.8 - gsf_input_http_new@Base 1.14.8 - gsf_input_memory_get_type@Base 1.14.8 - gsf_input_memory_new@Base 1.14.8 - gsf_input_memory_new_clone@Base 1.14.8 - gsf_input_memory_new_from_bzip@Base 1.14.8 - gsf_input_memory_new_from_iochannel@Base 1.14.8 - gsf_input_mmap_new@Base 1.14.8 - gsf_input_name@Base 1.14.8 - gsf_input_proxy_get_type@Base 1.14.8 - gsf_input_proxy_new@Base 1.14.8 - gsf_input_proxy_new_section@Base 1.14.8 - gsf_input_read0@Base 1.14.26 - gsf_input_read@Base 1.14.8 - gsf_input_remaining@Base 1.14.8 - gsf_input_seek@Base 1.14.8 - gsf_input_seek_emulate@Base 1.14.8 - gsf_input_set_container@Base 1.14.8 - gsf_input_set_name@Base 1.14.8 - gsf_input_set_name_from_filename@Base 1.14.8 - gsf_input_set_size@Base 1.14.8 - gsf_input_sibling@Base 1.14.8 - gsf_input_size@Base 1.14.8 - gsf_input_stdio_get_type@Base 1.14.8 - gsf_input_stdio_new@Base 1.14.8 - gsf_input_stdio_new_FILE@Base 1.14.8 - gsf_input_tell@Base 1.14.8 - gsf_input_textline_ascii_gets@Base 1.14.8 - gsf_input_textline_get_type@Base 1.14.8 - gsf_input_textline_new@Base 1.14.8 - gsf_input_textline_utf8_gets@Base 1.14.8 - gsf_input_uncompress@Base 1.14.8 - gsf_le_get_double@Base 1.14.8 - gsf_le_get_float@Base 1.14.8 - gsf_le_get_guint64@Base 1.14.8 - gsf_le_set_double@Base 1.14.8 - gsf_le_set_float@Base 1.14.8 - gsf_mem_dump@Base 1.14.8 - gsf_msole_codepage_to_lid@Base 1.14.8 - gsf_msole_iconv_open_codepage_for_export@Base 1.14.8 - gsf_msole_iconv_open_codepage_for_import@Base 1.14.8 - gsf_msole_iconv_open_codepages_for_export@Base 1.14.8 - gsf_msole_iconv_open_for_export@Base 1.14.8 - gsf_msole_iconv_open_for_import@Base 1.14.8 - gsf_msole_iconv_win_codepage@Base 1.14.8 - gsf_msole_inflate@Base 1.14.8 - gsf_msole_language_for_lid@Base 1.14.8 - gsf_msole_lid_for_language@Base 1.14.8 - gsf_msole_lid_to_codepage@Base 1.14.8 - gsf_msole_lid_to_codepage_str@Base 1.14.8 - gsf_msole_metadata_read@Base 1.14.8 - gsf_msole_metadata_write@Base 1.14.8 - gsf_msole_sorting_key_cmp@Base 1.14.22 - gsf_msole_sorting_key_free@Base 1.14.22 - gsf_msole_sorting_key_get_type@Base 1.14.24 - gsf_msole_sorting_key_new@Base 1.14.22 - gsf_odf_get_ns@Base 1.14.24 - gsf_odf_get_version@Base 1.14.24 - gsf_odf_get_version_string@Base 1.14.24 - gsf_odf_out_get_type@Base 1.14.23 - gsf_odf_out_get_version@Base 1.14.23 - gsf_odf_out_get_version_string@Base 1.14.23 - gsf_ooo_ns@Base 1.14.8 - gsf_open_pkg_error_id@Base 1.14.8 - gsf_open_pkg_foreach_rel@Base 1.14.9 - gsf_open_pkg_get_rel_by_id@Base 1.14.8 - gsf_open_pkg_get_rel_by_type@Base 1.14.8 - gsf_open_pkg_lookup_rel_by_id@Base 1.14.8 - gsf_open_pkg_lookup_rel_by_type@Base 1.14.8 - gsf_open_pkg_open_rel@Base 1.14.9 - gsf_open_pkg_open_rel_by_id@Base 1.14.8 - gsf_open_pkg_open_rel_by_type@Base 1.14.8 - gsf_open_pkg_parse_rel_by_id@Base 1.14.8 - gsf_open_pkg_rel_get_target@Base 1.14.8 - gsf_open_pkg_rel_get_type@Base 1.14.8 - gsf_open_pkg_rel_is_extern@Base 1.14.8 - gsf_opendoc_metadata_read@Base 1.14.8 - gsf_opendoc_metadata_subtree@Base 1.14.8 - gsf_opendoc_metadata_write@Base 1.14.8 - gsf_outfile_get_type@Base 1.14.8 - gsf_outfile_msole_get_type@Base 1.14.8 - gsf_outfile_msole_new@Base 1.14.8 - gsf_outfile_msole_new_full@Base 1.14.8 - gsf_outfile_msole_set_class_id@Base 1.14.8 - gsf_outfile_new_child@Base 1.14.8 - gsf_outfile_new_child_full@Base 1.14.8 - gsf_outfile_new_child_varg@Base 1.14.8 - gsf_outfile_open_pkg_add_extern_rel@Base 1.14.8 - gsf_outfile_open_pkg_add_rel@Base 1.14.8 - gsf_outfile_open_pkg_get_type@Base 1.14.8 - gsf_outfile_open_pkg_new@Base 1.14.8 - gsf_outfile_open_pkg_relate@Base 1.14.8 - gsf_outfile_open_pkg_set_content_type@Base 1.14.8 - gsf_outfile_open_pkg_set_sink@Base 1.14.8 - gsf_outfile_stdio_get_type@Base 1.14.8 - gsf_outfile_stdio_new@Base 1.14.8 - gsf_outfile_stdio_new_full@Base 1.14.8 - gsf_outfile_stdio_new_valist@Base 1.14.8 - gsf_outfile_zip_get_type@Base 1.14.8 - gsf_outfile_zip_new@Base 1.14.8 - gsf_outfile_zip_set_compression_method@Base 1.14.8 - gsf_output_bzip_get_type@Base 1.14.8 - gsf_output_bzip_new@Base 1.14.8 - gsf_output_close@Base 1.14.8 - gsf_output_container@Base 1.14.8 - gsf_output_csv_get_type@Base 1.14.8 - gsf_output_csv_quoting_mode_get_type@Base 1.14.8 - gsf_output_csv_write_eol@Base 1.14.8 - gsf_output_csv_write_field@Base 1.14.8 - gsf_output_error@Base 1.14.8 - gsf_output_error_id@Base 1.14.8 - gsf_output_get_type@Base 1.14.8 - gsf_output_gio_get_type@Base 1.14.9 - gsf_output_gio_new@Base 1.14.9 - gsf_output_gio_new_for_path@Base 1.14.9 - gsf_output_gio_new_for_uri@Base 1.14.9 - gsf_output_gzip_get_type@Base 1.14.8 - gsf_output_gzip_new@Base 1.14.8 - gsf_output_iconv_get_type@Base 1.14.8 - gsf_output_iconv_new@Base 1.14.8 - gsf_output_iochannel_get_type@Base 1.14.8 - gsf_output_iochannel_new@Base 1.14.8 - gsf_output_is_closed@Base 1.14.8 - gsf_output_memory_get_bytes@Base 1.14.8 - gsf_output_memory_get_type@Base 1.14.8 - gsf_output_memory_new@Base 1.14.8 - gsf_output_name@Base 1.14.8 - gsf_output_printf@Base 1.14.8 - gsf_output_puts@Base 1.14.8 - gsf_output_seek@Base 1.14.8 - gsf_output_set_container@Base 1.14.8 - gsf_output_set_error@Base 1.14.8 - gsf_output_set_name@Base 1.14.8 - gsf_output_set_name_from_filename@Base 1.14.8 - gsf_output_size@Base 1.14.8 - gsf_output_stdio_get_type@Base 1.14.8 - gsf_output_stdio_new@Base 1.14.8 - gsf_output_stdio_new_FILE@Base 1.14.8 - gsf_output_stdio_new_full@Base 1.14.8 - gsf_output_stdio_new_valist@Base 1.14.8 - gsf_output_tell@Base 1.14.8 - gsf_output_unwrap@Base 1.14.8 - gsf_output_vprintf@Base 1.14.8 - gsf_output_wrap@Base 1.14.8 - gsf_output_write@Base 1.14.8 - gsf_property_settings_collect@Base 1.14.8 - gsf_property_settings_collect_valist@Base 1.14.8 - gsf_property_settings_free@Base 1.14.8 - gsf_shared_memory_get_type@Base 1.14.8 - gsf_shared_memory_mmapped_new@Base 1.14.8 - gsf_shared_memory_new@Base 1.14.8 - gsf_shutdown@Base 1.14.8 - gsf_shutdown_dynamic@Base 1.14.8 - gsf_structured_blob_get_type@Base 1.14.8 - gsf_structured_blob_read@Base 1.14.8 - gsf_structured_blob_write@Base 1.14.8 - gsf_timestamp_as_string@Base 1.14.8 - gsf_timestamp_copy@Base 1.14.8 - gsf_timestamp_equal@Base 1.14.8 - gsf_timestamp_free@Base 1.14.8 - gsf_timestamp_from_string@Base 1.14.12 - gsf_timestamp_get_type@Base 1.14.8 - gsf_timestamp_hash@Base 1.14.8 - gsf_timestamp_load_from_string@Base 1.14.24 - gsf_timestamp_new@Base 1.14.15 - gsf_timestamp_parse@Base 1.14.8 - gsf_timestamp_set_time@Base 1.14.15 - gsf_timestamp_to_value@Base 1.14.24 - gsf_value_get_docprop_varray@Base 1.14.8 - gsf_value_get_docprop_vector@Base 1.14.8 - gsf_value_set_timestamp@Base 1.14.8 - gsf_vba_inflate@Base 1.14.26 - gsf_vdir_add_child@Base 1.14.8 - gsf_vdir_free@Base 1.14.8 - gsf_vdir_new@Base 1.14.8 - gsf_xmlDocFormatDump@Base 1.14.8 - gsf_xml_gvalue_from_str@Base 1.14.8 - gsf_xml_in_check_ns@Base 1.14.8 - gsf_xml_in_doc_add_nodes@Base 1.14.9 - gsf_xml_in_doc_free@Base 1.14.8 - gsf_xml_in_doc_get_type@Base 1.14.24 - gsf_xml_in_doc_new@Base 1.14.8 - gsf_xml_in_doc_parse@Base 1.14.8 - gsf_xml_in_doc_set_unknown_handler@Base 1.14.8 - gsf_xml_in_get_input@Base 1.14.8 - gsf_xml_in_namecmp@Base 1.14.8 - gsf_xml_in_ns_get_type@Base 1.14.24 - gsf_xml_in_push_state@Base 1.14.8 - gsf_xml_out_add_base64@Base 1.14.8 - gsf_xml_out_add_bool@Base 1.14.8 - gsf_xml_out_add_color@Base 1.14.8 - gsf_xml_out_add_cstr@Base 1.14.8 - gsf_xml_out_add_cstr_unchecked@Base 1.14.8 - gsf_xml_out_add_enum@Base 1.14.8 - gsf_xml_out_add_float@Base 1.14.8 - gsf_xml_out_add_gvalue@Base 1.14.8 - gsf_xml_out_add_int@Base 1.14.8 - gsf_xml_out_add_uint@Base 1.14.8 - gsf_xml_out_end_element@Base 1.14.8 - gsf_xml_out_get_output@Base 1.14.8 - gsf_xml_out_get_type@Base 1.14.8 - gsf_xml_out_new@Base 1.14.8 - gsf_xml_out_set_doc_type@Base 1.14.8 - gsf_xml_out_simple_element@Base 1.14.8 - gsf_xml_out_simple_float_element@Base 1.14.8 - gsf_xml_out_simple_int_element@Base 1.14.8 - gsf_xml_out_start_element@Base 1.14.8 - gsf_xml_parser_context@Base 1.14.8 - gsf_xml_probe@Base 1.14.11 - gsf_zip_dirent_free@Base 1.14.8 - gsf_zip_dirent_get_type@Base 1.14.24 - gsf_zip_dirent_new@Base 1.14.8 - gsf_zip_vdir_add_child@Base 1.14.24 - gsf_zip_vdir_free@Base 1.14.24 - gsf_zip_vdir_get_type@Base 1.14.24 - gsf_zip_vdir_new@Base 1.14.24 - libgsf_major_version@Base 1.14.8 - libgsf_micro_version@Base 1.14.8 - libgsf_minor_version@Base 1.14.8 diff --git a/debian/libgsf-1-common.dirs b/debian/libgsf-1-common.dirs deleted file mode 100644 index 3635480..0000000 --- a/debian/libgsf-1-common.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale diff --git a/debian/libgsf-1-common.install b/debian/libgsf-1-common.install deleted file mode 100644 index 8c3410e..0000000 --- a/debian/libgsf-1-common.install +++ /dev/null @@ -1 +0,0 @@ -usr/share/locale/*/LC_MESSAGES/libgsf.mo diff --git a/debian/libgsf-1-dev.dirs b/debian/libgsf-1-dev.dirs deleted file mode 100644 index 7fa55e3..0000000 --- a/debian/libgsf-1-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/lib -usr/include -usr/share/gir-1.0 diff --git a/debian/libgsf-1-dev.doc-base b/debian/libgsf-1-dev.doc-base deleted file mode 100644 index 15e6f6d..0000000 --- a/debian/libgsf-1-dev.doc-base +++ /dev/null @@ -1,11 +0,0 @@ -Document: gsfmanual -Title: GSF Reference Manual -Author: Jody Goldberg -Abstract: Reference manual for the GNOME Structured File Library. - The GNOME Structured File Library (GSF) is an I/O abstraction for reading/ - writing compound files. -Section: Programming/C - -Format: HTML -Index: /usr/share/doc/libgsf-1-dev/html/gsf/index.html -Files: /usr/share/doc/libgsf-1-dev/html/gsf/* diff --git a/debian/libgsf-1-dev.install b/debian/libgsf-1-dev.install deleted file mode 100644 index ffd1ac8..0000000 --- a/debian/libgsf-1-dev.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/include/libgsf-*/gsf/* -usr/lib/libgsf-[0-9]*.a -usr/lib/libgsf-[0-9]*.so -usr/lib/pkgconfig/libgsf-[0-9]*.pc -usr/share/doc/libgsf-1-dev/html/* -usr/share/gir-1.0/Gsf-1.gir diff --git a/debian/libgsf-bin.dirs b/debian/libgsf-bin.dirs deleted file mode 100644 index 31c1c3c..0000000 --- a/debian/libgsf-bin.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/bin -usr/share/gconf/schemas diff --git a/debian/libgsf-bin.install b/debian/libgsf-bin.install deleted file mode 100644 index cfe98e5..0000000 --- a/debian/libgsf-bin.install +++ /dev/null @@ -1,7 +0,0 @@ -usr/bin/gsf -usr/bin/gsf-office-thumbnailer -usr/bin/gsf-vba-dump -usr/share/man/man1/gsf-office-thumbnailer.1 -usr/share/man/man1/gsf-vba-dump.1 -usr/share/man/man1/gsf.1 -usr/share/thumbnailers/gsf-office.thumbnailer diff --git a/debian/libgsf-gnome-1-114-dbg.dirs b/debian/libgsf-gnome-1-114-dbg.dirs deleted file mode 100644 index 1acc2ff..0000000 --- a/debian/libgsf-gnome-1-114-dbg.dirs +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/debug diff --git a/debian/libgsf-gnome-1-114-dbg.install b/debian/libgsf-gnome-1-114-dbg.install deleted file mode 100644 index 343b778..0000000 --- a/debian/libgsf-gnome-1-114-dbg.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/debug/libgsf-gnome*.so* diff --git a/debian/libgsf-gnome-1-114.dirs b/debian/libgsf-gnome-1-114.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libgsf-gnome-1-114.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libgsf-gnome-1-114.install b/debian/libgsf-gnome-1-114.install deleted file mode 100644 index b277e19..0000000 --- a/debian/libgsf-gnome-1-114.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libgsf-gnome-1.so.* diff --git a/debian/libgsf-gnome-1-114.symbols b/debian/libgsf-gnome-1-114.symbols deleted file mode 100644 index 0c17e07..0000000 --- a/debian/libgsf-gnome-1-114.symbols +++ /dev/null @@ -1,13 +0,0 @@ -libgsf-gnome-1.so.114 libgsf-gnome-1-114 #MINVER# - gsf_input_bonobo_get_type@Base 1.14.8 - gsf_input_bonobo_new@Base 1.14.8 - gsf_input_gnomevfs_get_type@Base 1.14.11 - gsf_input_gnomevfs_new@Base 1.14.11 - gsf_input_gnomevfs_new_uri@Base 1.14.11 - gsf_output_bonobo_get_type@Base 1.14.8 - gsf_output_bonobo_new@Base 1.14.8 - gsf_output_gnomevfs_get_type@Base 1.14.11 - gsf_output_gnomevfs_new@Base 1.14.11 - gsf_output_gnomevfs_new_uri@Base 1.14.11 - gsf_shared_bonobo_stream_get_type@Base 1.14.8 - gsf_shared_bonobo_stream_new@Base 1.14.8 diff --git a/debian/libgsf-gnome-1-dev.dirs b/debian/libgsf-gnome-1-dev.dirs deleted file mode 100644 index 4418816..0000000 --- a/debian/libgsf-gnome-1-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/libgsf-gnome-1-dev.install b/debian/libgsf-gnome-1-dev.install deleted file mode 100644 index 50ebf8e..0000000 --- a/debian/libgsf-gnome-1-dev.install +++ /dev/null @@ -1,4 +0,0 @@ -usr/include/libgsf*/gsf-gnome/* -usr/lib/libgsf-gnome*.a -usr/lib/libgsf-gnome*.so -usr/lib/pkgconfig/libgsf-gnome*.pc diff --git a/debian/patches/1eff4c3 b/debian/patches/1eff4c3 deleted file mode 100644 index 44b3949..0000000 --- a/debian/patches/1eff4c3 +++ /dev/null @@ -1,482 +0,0 @@ -commit 1eff4c3c4687b35fc57a9d1531a1e7299508d2f2 -Author: Daniel Mustieles -Date: Mon Mar 4 17:16:01 2013 +0100 - - Updated Spanish translation - -diff --git a/po/es.po b/po/es.po -index 7f8a919..3692cdd 100644 ---- a/po/es.po -+++ b/po/es.po -@@ -3,15 +3,15 @@ - # This file is distributed under the same license as the PACKAGE package. - # - # Jorge González , 2009. --# Daniel Mustieles , 2012. -+# Daniel Mustieles , 2012, 2013. - # - msgid "" - msgstr "" - "Project-Id-Version: libgsf.master\n" - "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" - "product=libgsf&keywords=I18N+L10N&component=General\n" --"POT-Creation-Date: 2012-10-16 17:52+0000\n" --"PO-Revision-Date: 2012-10-17 18:03+0200\n" -+"POT-Creation-Date: 2013-03-03 15:19+0000\n" -+"PO-Revision-Date: 2013-03-04 16:48+0100\n" - "Last-Translator: Daniel Mustieles \n" - "Language-Team: Español \n" - "Language: \n" -@@ -21,17 +21,17 @@ msgstr "" - "X-Generator: KBabel 1.11.4\n" - "Plural-Forms: nplurals=2; plural=(n!=1);\n" - --#: ../gsf/gsf-blob.c:115 -+#: ../gsf/gsf-blob.c:113 - #, c-format - msgid "Not enough memory to copy %s bytes of data" - msgstr "No hay memoria suficiente para copiar %s bytes de datos" - --#: ../gsf/gsf-clip-data.c:166 -+#: ../gsf/gsf-clip-data.c:165 - #, c-format - msgid "The clip_data is in %s, but it is smaller than at least %s bytes" - msgstr "El clip_data está en %s, pero es más pequeño de al menos %s bytes" - --#: ../gsf/gsf-clip-data.c:260 -+#: ../gsf/gsf-clip-data.c:259 - #, c-format - msgid "" - "The clip_data is in Windows clipboard format, but it is smaller than the " -@@ -40,38 +40,117 @@ msgstr "" - "El clip_data está en el formato de Windows, pero es más pequeño de los 4 " - "bytes requeridos." - --#: ../gsf/gsf-clip-data.c:271 -+#: ../gsf/gsf-clip-data.c:270 - msgid "Windows Metafile format" - msgstr "Formato de meta archivo de Windows" - - #. CF_BITMAP --#: ../gsf/gsf-clip-data.c:277 -+#: ../gsf/gsf-clip-data.c:276 - msgid "Windows DIB or BITMAP format" - msgstr "Formato DIB o BITMAP de Windows" - --#: ../gsf/gsf-clip-data.c:282 -+#: ../gsf/gsf-clip-data.c:281 - msgid "Windows Enhanced Metafile format" - msgstr "Formato de meta archivo mejorado de Windows" - --#: ../gsf/gsf-libxml.c:1493 -+#: ../gsf/gsf-infile-tar.c:542 ../gsf/gsf-infile-zip.c:821 -+#: ../gsf/gsf-input-gzip.c:506 -+msgid "Source" -+msgstr "Fuente" -+ -+#: ../gsf/gsf-infile-tar.c:543 ../gsf/gsf-infile-zip.c:822 -+msgid "The archive being interpreted" -+msgstr "El archivo que se está interpretando" -+ -+#: ../gsf/gsf-infile-zip.c:837 ../gsf/gsf-outfile-zip.c:727 -+msgid "Compression Level" -+msgstr "Nivel de compresión" -+ -+#: ../gsf/gsf-infile-zip.c:838 ../gsf/gsf-outfile-zip.c:728 -+msgid "The level of compression used, zero meaning none" -+msgstr "El nivel de compresión usado; cero significa ninguno" -+ -+#: ../gsf/gsf-input-gzip.c:495 -+msgid "Raw" -+msgstr "" -+ -+#: ../gsf/gsf-input-gzip.c:496 -+msgid "Whether to read compressed data with no header and no trailer" -+msgstr "" -+ -+#: ../gsf/gsf-input-gzip.c:507 -+msgid "Where the compressed data comes from" -+msgstr "De dónde provienen los datos comprimidos" -+ -+#: ../gsf/gsf-input-gzip.c:523 -+msgid "Size after decompression" -+msgstr "Tamaño después de descomprimir" -+ -+#: ../gsf/gsf-input-gzip.c:524 -+msgid "The source's uncompressed size" -+msgstr "El tamaño de la fuente sin comprimir" -+ -+#: ../gsf/gsf-input.c:122 ../gsf/gsf-output.c:136 -+msgid "Name" -+msgstr "Nombre" -+ -+#: ../gsf/gsf-input.c:123 -+msgid "The input's name" -+msgstr "El nombre de la entrada" -+ -+#: ../gsf/gsf-input.c:132 ../gsf/gsf-output.c:146 -+msgid "Size" -+msgstr "Tamaño" -+ -+#: ../gsf/gsf-input.c:133 -+msgid "The input's size" -+msgstr "El tamaño de la entrada" -+ -+#: ../gsf/gsf-input.c:147 -+msgid "EOF" -+msgstr "EOF" -+ -+#: ../gsf/gsf-input.c:148 -+msgid "End of file" -+msgstr "Fin del archivo" -+ -+#: ../gsf/gsf-input.c:157 -+msgid "Remaining" -+msgstr "Restante" -+ -+#: ../gsf/gsf-input.c:158 -+msgid "Amount of data remaining" -+msgstr "" -+ -+#: ../gsf/gsf-input.c:167 ../gsf/gsf-output.c:156 -+msgid "Position" -+msgstr "Posición" -+ -+#: ../gsf/gsf-input.c:168 -+msgid "The input's current position" -+msgstr "" -+ -+#: ../gsf/gsf-libxml.c:1497 - msgid "Pretty print" - msgstr "Impresión bonita" - --#: ../gsf/gsf-libxml.c:1494 -+#: ../gsf/gsf-libxml.c:1498 - msgid "Should the output auto-indent elements to make reading easier?" - msgstr "" - "¿Debe la salida sangrar automáticamente los elementos para facilitar la " - "lectura?" - --#: ../gsf/gsf-libxml.c:1500 -+#: ../gsf/gsf-libxml.c:1504 ../gsf/gsf-open-pkg-utils.c:729 -+#: ../gsf/gsf-outfile-zip.c:707 ../gsf/gsf-output-csv.c:333 -+#: ../gsf/gsf-output-iconv.c:276 - msgid "Sink" - msgstr "Destino" - --#: ../gsf/gsf-libxml.c:1501 -+#: ../gsf/gsf-libxml.c:1505 - msgid "The destination for writes" - msgstr "El destino de la escritura" - --#: ../gsf/gsf-msole-utils.c:315 -+#: ../gsf/gsf-msole-utils.c:312 - #, c-format - msgid "" - "Missing data when reading the %s property; got %s bytes, but %s bytes at " -@@ -80,7 +159,7 @@ msgstr "" - "Faltan datos al leer la propiedad %s; se obtuvieron %s bytes pero se " - "necesitan al menos %s bytes." - --#: ../gsf/gsf-msole-utils.c:366 -+#: ../gsf/gsf-msole-utils.c:363 - #, c-format - msgid "" - "Corrupt data in the VT_CF property; clipboard data length must be at least 4 " -@@ -90,116 +169,248 @@ msgstr "" - "de al menos 4 bytes, pero los datos dicen que sólo tiene %s bytes " - "disponibles." - --#: ../gsf/gsf-open-pkg-utils.c:355 -+#: ../gsf/gsf-open-pkg-utils.c:353 - #, c-format - msgid "Unable to find part id='%s' for '%s'" - msgstr "No se pudo encontrar la parte con ID=«%s» para «%s»" - --#: ../gsf/gsf-open-pkg-utils.c:383 -+#: ../gsf/gsf-open-pkg-utils.c:381 - #, c-format - msgid "Unable to find part with type='%s' for '%s'" - msgstr "No se pudo encontrar la parte con el tipo=«%s» para «%s»" - --#: ../gsf/gsf-open-pkg-utils.c:413 -+#: ../gsf/gsf-open-pkg-utils.c:411 - #, c-format - msgid "Missing id for part in '%s'" - msgstr "Falta un ID para una parte en «%s»" - --#: ../gsf/gsf-open-pkg-utils.c:422 -+#: ../gsf/gsf-open-pkg-utils.c:420 - #, c-format - msgid "Part '%s' in '%s' from '%s' is corrupt!" - msgstr "La parte «%s» en «%s» de «%s» está corrupta." - --#: ../gsf/gsf-opendoc-utils.c:353 -+#: ../gsf/gsf-open-pkg-utils.c:730 -+msgid "The GsfOutput that stores the Open Package content" -+msgstr "" -+ -+#: ../gsf/gsf-open-pkg-utils.c:736 -+msgid "Content type" -+msgstr "Tipo de contenido" -+ -+#: ../gsf/gsf-open-pkg-utils.c:737 -+msgid "The content type stored in the root [Content_Types].xml file" -+msgstr "" -+ -+#: ../gsf/gsf-open-pkg-utils.c:743 -+msgid "Is Directory" -+msgstr "" -+ -+#: ../gsf/gsf-open-pkg-utils.c:744 -+msgid "Can the outfile have children" -+msgstr "" -+ -+#: ../gsf/gsf-opendoc-utils.c:355 - #, c-format - msgid "Property \"%s\" used for multiple types!" - msgstr "La propiedad %s se usa para varios tipos." - --#: ../gsf/gsf-opendoc-utils.c:878 -+#: ../gsf/gsf-opendoc-utils.c:880 - msgid "ODF version" - msgstr "Versión ODF" - --#: ../gsf/gsf-opendoc-utils.c:879 -+#: ../gsf/gsf-opendoc-utils.c:881 - msgid "The ODF version this object is targeting as an integer like 100" - msgstr "La versión ODF de este objeto se refiere a un entero como 100" - --#: ../tools/gsf.c:27 -+#: ../gsf/gsf-outfile-zip.c:708 -+msgid "Where the archive is written" -+msgstr "Dónde se escribe el archivo" -+ -+#: ../gsf/gsf-outfile-zip.c:717 -+msgid "Entry Name" -+msgstr "" -+ -+#: ../gsf/gsf-outfile-zip.c:718 -+msgid "The filename of this member in the archive without path" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:334 -+msgid "Where the formatted output is written" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:343 -+msgid "Quote" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:344 -+msgid "The string used for quoting fields" -+msgstr "La cadena usada para citar campos" -+ -+#: ../gsf/gsf-output-csv.c:354 -+msgid "Quoting Mode" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:355 -+msgid "When to quote fields" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:366 -+msgid "Quoting Triggers" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:367 -+msgid "Characters that cause field quoting" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:376 -+msgid "Quoting On Whitespace" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:377 -+msgid "Does initial or terminal whitespace force quoting?" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:386 -+msgid "Separator" -+msgstr "Separador" -+ -+#: ../gsf/gsf-output-csv.c:387 -+msgid "The field separator" -+msgstr "El separador de campos" -+ -+#: ../gsf/gsf-output-csv.c:397 -+msgid "end-on-line" -+msgstr "" -+ -+#: ../gsf/gsf-output-csv.c:398 -+msgid "The end-of-line marker" -+msgstr "El marcador de fin de línea" -+ -+#: ../gsf/gsf-output-iconv.c:277 -+msgid "Where the converted data is written" -+msgstr "" -+ -+#: ../gsf/gsf-output-iconv.c:287 -+msgid "Input Charset" -+msgstr "Conjunto de caracteres de entrada" -+ -+#: ../gsf/gsf-output-iconv.c:288 -+msgid "The character set to convert from" -+msgstr "" -+ -+#: ../gsf/gsf-output-iconv.c:297 -+msgid "Output Charset" -+msgstr "Conjunto de caracteres de salida" -+ -+#: ../gsf/gsf-output-iconv.c:298 -+msgid "The character set to convert to" -+msgstr "" -+ -+#: ../gsf/gsf-output-iconv.c:314 -+msgid "Fallback" -+msgstr "Alternativo" -+ -+#: ../gsf/gsf-output-iconv.c:315 -+msgid "The string to use for invalid characters" -+msgstr "La cadena usada para caracteres no válidos" -+ -+#: ../gsf/gsf-output.c:137 -+msgid "The output's name" -+msgstr "El nombre de la salida" -+ -+#: ../gsf/gsf-output.c:147 -+msgid "The output's size" -+msgstr "El tamaño de la salida" -+ -+#: ../gsf/gsf-output.c:157 -+msgid "The output's current position" -+msgstr "La posición actual de la salida" -+ -+#: ../gsf/gsf-output.c:166 -+msgid "Is Closed" -+msgstr "" -+ -+#: ../gsf/gsf-output.c:167 -+msgid "Whether the output is closed" -+msgstr "Indica si la salida está cerrada" -+ -+#: ../tools/gsf.c:15 - msgid "Display program version" - msgstr "Mostrar la versión del programa" - --#: ../tools/gsf.c:54 -+#: ../tools/gsf.c:42 - #, c-format - msgid "%s: Failed to open %s: %s\n" - msgstr "%s: Falló al abrir %s: %s\n" - --#: ../tools/gsf.c:75 -+#: ../tools/gsf.c:63 - #, c-format - msgid "%s: Failed to recognize %s as an archive\n" - msgstr "%s: Falló al reconocer %s como un archivador\n" - --#: ../tools/gsf.c:112 -+#: ../tools/gsf.c:100 - #, c-format - msgid "Available subcommands are...\n" - msgstr "Los subcomandos disponibles son...\n" - --#: ../tools/gsf.c:113 -+#: ../tools/gsf.c:101 - #, c-format - msgid "* cat output one or more files in archive\n" - msgstr "* cat muestra la salida de uno o más archivadores\n" - --#: ../tools/gsf.c:114 -+#: ../tools/gsf.c:102 - #, c-format - msgid "* dump dump one or more files in archive as hex\n" - msgstr "" - "* dump vuelca uno o más archivos en un archivador como datos " - "hexadecimales\n" - --#: ../tools/gsf.c:115 -+#: ../tools/gsf.c:103 - #, c-format - msgid "* help list subcommands\n" - msgstr "* help lista los subcomandos\n" - --#: ../tools/gsf.c:116 -+#: ../tools/gsf.c:104 - #, c-format - msgid "* list list files in archive\n" - msgstr "* list lista los archivos en el archivador\n" - --#: ../tools/gsf.c:117 -+#: ../tools/gsf.c:105 - #, c-format - msgid "* listprops list document properties in archive\n" - msgstr "" - "* listprops lista las propiedades de los documentos en el archivador\n" - --#: ../tools/gsf.c:118 -+#: ../tools/gsf.c:106 - #, c-format - msgid "* props print specified document properties\n" - msgstr "* props imprime las propiedades del documento especificado\n" - --#: ../tools/gsf.c:119 -+#: ../tools/gsf.c:107 - #, c-format - msgid "* createole create OLE archive\n" - msgstr "* createole crear archivador OLE\n" - --#: ../tools/gsf.c:120 -+#: ../tools/gsf.c:108 - #, c-format - msgid "* createzip create ZIP archive\n" - msgstr "* createzip crear archivador ZIP\n" - --#: ../tools/gsf.c:303 -+#: ../tools/gsf.c:291 - #, c-format - msgid "No property named %s\n" - msgstr "No existe la propiedad de nombre %s\n" - --#: ../tools/gsf.c:362 -+#: ../tools/gsf.c:350 - #, c-format - msgid "%s: Error processing file %s: %s\n" - msgstr "%s:error al procesar el archivo %s: %s\n" - --#: ../tools/gsf.c:526 -+#: ../tools/gsf.c:514 - msgid "SUBCOMMAND ARCHIVE..." - msgstr "SUBCOMANDO ARCHIVADOR..." - --#: ../tools/gsf.c:533 -+#: ../tools/gsf.c:521 - #, c-format - msgid "" - "%s\n" -@@ -209,19 +420,20 @@ msgstr "" - "Ejecute «%s --help» para ver una lista completa de todas las opciones " - "disponibles de la línea de comandos.\n" - --#: ../tools/gsf.c:540 -+#: ../tools/gsf.c:528 - #, c-format - msgid "gsf version %d.%d.%d\n" - msgstr "Versión de gsf %d.%d.%d\n" - --#: ../tools/gsf.c:546 -+#: ../tools/gsf.c:534 - #, c-format - msgid "Usage: %s %s\n" - msgstr "Uso: %s %s\n" - --#: ../tools/gsf.c:571 -+#: ../tools/gsf.c:559 - #, c-format --msgid "Run '%s help' to see a list subcommands.\n" -+#| msgid "Run '%s help' to see a list subcommands.\n" -+msgid "Run '%s help' to see a list of subcommands.\n" - msgstr "Ejecite «%s help» para ver una lista de los subcomandos.\n" - - #~ msgid "" diff --git a/debian/patches/69bb2f0 b/debian/patches/69bb2f0 deleted file mode 100644 index fa85de9..0000000 --- a/debian/patches/69bb2f0 +++ /dev/null @@ -1,176 +0,0 @@ -commit 69bb2f0d1a164cd9eba30bc97cb306d202632753 -Author: Morten Welinder -Date: Fri Mar 1 14:12:37 2013 -0500 - - Introspection fixes - -diff --git a/gsf/gsf-infile-zip.c b/gsf/gsf-infile-zip.c -index 267211c..d42662a 100644 ---- a/gsf/gsf-infile-zip.c -+++ b/gsf/gsf-infile-zip.c -@@ -858,7 +858,7 @@ GSF_CLASS (GsfInfileZip, gsf_infile_zip, - /** - * gsf_infile_zip_new: - * @source: A base #GsfInput -- * @err: A #GError, optionally %null -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Opens the root directory of a Zip file. - * This adds a reference to @source. -diff --git a/gsf/gsf-input-bzip.c b/gsf/gsf-input-bzip.c -index 9a2d83e..5da1412 100644 ---- a/gsf/gsf-input-bzip.c -+++ b/gsf/gsf-input-bzip.c -@@ -33,7 +33,7 @@ - /** - * gsf_input_memory_new_from_bzip: - * @source: a #GsfInput -- * @err: a #GError -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Returns: a new #GsfInputMemory or %NULL. - */ -diff --git a/gsf/gsf-input-gzip.c b/gsf/gsf-input-gzip.c -index b6849c5..b5556cb 100644 ---- a/gsf/gsf-input-gzip.c -+++ b/gsf/gsf-input-gzip.c -@@ -196,7 +196,7 @@ gsf_input_gzip_set_source (GsfInputGZip *gzip, GsfInput *source) - /** - * gsf_input_gzip_new: - * @source: The underlying data source. -- * @err: optionally %NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Adds a reference to @source. - * -diff --git a/gsf/gsf-input-stdio.c b/gsf/gsf-input-stdio.c -index 6b534a5..b99c74c 100644 ---- a/gsf/gsf-input-stdio.c -+++ b/gsf/gsf-input-stdio.c -@@ -155,13 +155,13 @@ gsf_input_stdio_new (char const *filename, GError **err) - /** - * gsf_input_stdio_new_FILE: - * @filename: The filename corresponding to @file. -- * @file: an existing stdio FILE * -+ * @file: (transfer full): an existing stdio FILE * - * @keep_open: Should @file be closed when the wrapper is closed - * - * Assumes ownership of @file when succeeding. If @keep_open is true, -- * ownership reverts to caller when the GsfObject is closed. -+ * ownership reverts to caller when the #GsfInput is closed. - * -- * Returns: a new GsfInput wrapper for @file. Note that if the file is not -+ * Returns: a new #GsfInput wrapper for @file. Note that if the file is not - * seekable, this function will make a local copy of the entire file. - **/ - GsfInput * -@@ -319,4 +319,3 @@ gsf_input_stdio_class_init (GObjectClass *gobject_class) - GSF_CLASS (GsfInputStdio, gsf_input_stdio, - gsf_input_stdio_class_init, gsf_input_stdio_init, - GSF_INPUT_TYPE) -- -diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c -index c95896e..2944a9b 100644 ---- a/gsf/gsf-input.c -+++ b/gsf/gsf-input.c -@@ -193,7 +193,7 @@ gsf_input_container (GsfInput *input) - /** - * gsf_input_dup: - * @input: The input to duplicate -- * @err: optionally %NULL -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Duplicates input @src leaving the new one at the same offset. - * -@@ -235,7 +235,7 @@ gsf_input_dup (GsfInput *input, GError **err) - * gsf_input_sibling: - * @input: The input - * @name: name. -- * @err: #GError -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * UNIMPLEMENTED BY ANY BACKEND - * and it is probably unnecessary. gsf_input_get_container provides -@@ -258,9 +258,7 @@ gsf_input_sibling (GsfInput const *input, char const *name, GError **err) - * gsf_input_size: - * @input: The input - * -- * Looks up and caches the number of bytes in the input -- * -- * Returns: the size or -1 on error -+ * Returns: the total number of bytes in the input or -1 on error - **/ - gsf_off_t - gsf_input_size (GsfInput *input) -@@ -602,8 +600,8 @@ gsf_input_copy (GsfInput *input, GsfOutput *output) - * This functions takes ownership of the incoming reference and yields a - * new one as its output. - * -- * Returns: (transfer full): A stream equivalent to the source stream, but uncompressed if -- * the source was compressed. -+ * Returns: (transfer full): A stream equivalent to the source stream, -+ * but uncompressed if the source was compressed. - **/ - GsfInput * - gsf_input_uncompress (GsfInput *src) -diff --git a/gsf/gsf-output-stdio.c b/gsf/gsf-output-stdio.c -index 34048b3..bf89aef 100644 ---- a/gsf/gsf-output-stdio.c -+++ b/gsf/gsf-output-stdio.c -@@ -521,7 +521,7 @@ gsf_output_stdio_new_valist (char const *filename, GError **err, - /** - * gsf_output_stdio_new_full: - * @filename: name of file to create or replace. -- * @err: optionally %NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * @first_property_name: %NULL terminated list of properties - * @...: - * -@@ -544,7 +544,7 @@ gsf_output_stdio_new_full (char const *filename, GError **err, - /** - * gsf_output_stdio_new: - * @filename: name of file to create or replace. -- * @err: optionally %NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Returns: a new file or %NULL. - **/ -@@ -555,13 +555,13 @@ gsf_output_stdio_new (char const *filename, GError **err) - } - - /** -- * gsf_output_stdio_new_FILE: -+ * gsf_output_stdio_new_FILE: (skip) - * @filename: The filename corresponding to @file. -- * @file: an existing stdio FILE * -+ * @file: (transfer full): an existing stdio FILE * - * @keep_open: Should @file be closed when the wrapper is closed - * - * Assumes ownership of @file. If @keep_open is true, ownership reverts -- * to caller when the GsfObject is closed. -+ * to caller when the GsfOutput is closed. - * - * Returns: a new GsfOutput wrapper for @file. Warning: the result will be - * seekable only if @file is seekable. If it is seekable, the resulting -diff --git a/gsf/gsf-output.c b/gsf/gsf-output.c -index 49c8e3c..fb02fb2 100644 ---- a/gsf/gsf-output.c -+++ b/gsf/gsf-output.c -@@ -360,7 +360,7 @@ gsf_output_write (GsfOutput *output, - * gsf_output_error: - * @output: - * -- * Returns: the last error logged on the output, or %NULL. -+ * Returns: (transfer none): the last error logged on the output, or %NULL. - **/ - GError const * - gsf_output_error (GsfOutput const *output) -@@ -628,7 +628,7 @@ gsf_output_real_vprintf (GsfOutput *output, char const *fmt, va_list args) - /** - * gsf_output_puts: - * @output: A #GsfOutput -- * @line: %null terminated string to write -+ * @line: Nul terminated string to write - * - * Like fputs, this assumes that the line already ends with a newline - * diff --git a/debian/patches/afd9445 b/debian/patches/afd9445 deleted file mode 100644 index 1f3e75c..0000000 --- a/debian/patches/afd9445 +++ /dev/null @@ -1,286 +0,0 @@ -commit afd9445ca607b3189ed9f9b2edbf0620d639c612 -Author: Matej Urbančič -Date: Fri Mar 1 20:23:03 2013 +0100 - - Updated Slovenian translation - -diff --git a/po/sl.po b/po/sl.po -index 1a453b6..2be012a 100644 ---- a/po/sl.po -+++ b/po/sl.po -@@ -2,186 +2,201 @@ - # Copyright (C) 2009 libgsf's COPYRIGHT HOLDER - # This file is distributed under the same license as the libgsf package. - # --# Matej Urbančič , 2009 - 2012. -+# Matej Urbančič , 2009 - 2013. - # - msgid "" - msgstr "" - "Project-Id-Version: libgsf master\n" --"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=libgsf&keywords=I18N+L10N&component=General\n" --"POT-Creation-Date: 2012-10-16 17:52+0000\n" --"PO-Revision-Date: 2012-10-16 20:11+0100\n" -+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" -+"product=libgsf&keywords=I18N+L10N&component=General\n" -+"POT-Creation-Date: 2013-03-01 19:13+0000\n" -+"PO-Revision-Date: 2013-03-01 20:19+0100\n" - "Last-Translator: Matej Urbančič \n" - "Language-Team: Slovenian GNOME Translation Team \n" --"Language: \n" -+"Language: sl_SI\n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" - "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n" --"X-Poedit-Country: SLOVENIA\n" --"X-Poedit-Language: Slovenian\n" - "X-Poedit-SourceCharset: utf-8\n" -+"X-Generator: Poedit 1.5.4\n" - --#: ../gsf/gsf-blob.c:115 -+#: ../gsf/gsf-blob.c:113 - #, c-format - msgid "Not enough memory to copy %s bytes of data" - msgstr "Ni dovolj pomnilnika za kopiranje %s bajtov podatkov" - --#: ../gsf/gsf-clip-data.c:166 -+#: ../gsf/gsf-clip-data.c:165 - #, c-format - msgid "The clip_data is in %s, but it is smaller than at least %s bytes" - msgstr "Clip_data je del %s, vendar je manjši kot %s bajtov" - --#: ../gsf/gsf-clip-data.c:260 -+#: ../gsf/gsf-clip-data.c:259 - #, c-format --msgid "The clip_data is in Windows clipboard format, but it is smaller than the required 4 bytes." --msgstr "Clip_data je običajni Windows zapis odložišča, vendar je manjši od zahtevanih 4 bajtov." -+msgid "" -+"The clip_data is in Windows clipboard format, but it is smaller than the " -+"required 4 bytes." -+msgstr "" -+"Clip_data je običajni Windows zapis odložišča, vendar je manjši od " -+"zahtevanih 4 bajtov." - --#: ../gsf/gsf-clip-data.c:271 -+#: ../gsf/gsf-clip-data.c:270 - msgid "Windows Metafile format" - msgstr "Zapis Windows Metafile" - - #. CF_BITMAP --#: ../gsf/gsf-clip-data.c:277 -+#: ../gsf/gsf-clip-data.c:276 - msgid "Windows DIB or BITMAP format" - msgstr "Zapis Windows DIB ali BITMAP" - --#: ../gsf/gsf-clip-data.c:282 -+#: ../gsf/gsf-clip-data.c:281 - msgid "Windows Enhanced Metafile format" - msgstr "Zapis Windows Enhanced Metafile" - --#: ../gsf/gsf-libxml.c:1493 -+#: ../gsf/gsf-libxml.c:1497 - msgid "Pretty print" - msgstr "Oblikovno izrisovanje" - --#: ../gsf/gsf-libxml.c:1494 -+#: ../gsf/gsf-libxml.c:1498 - msgid "Should the output auto-indent elements to make reading easier?" - msgstr "Ali naj se v odvodu predmeti samodejno zamaknejo za lažje branje?" - --#: ../gsf/gsf-libxml.c:1500 -+#: ../gsf/gsf-libxml.c:1504 - msgid "Sink" - msgstr "Ponor" - --#: ../gsf/gsf-libxml.c:1501 -+#: ../gsf/gsf-libxml.c:1505 - msgid "The destination for writes" - msgstr "Cilj za izvozne datoteke" - --#: ../gsf/gsf-msole-utils.c:315 -+#: ../gsf/gsf-msole-utils.c:312 - #, c-format --msgid "Missing data when reading the %s property; got %s bytes, but %s bytes at least are needed." --msgstr "Manjkajoči podatki med branjem lastnosti %s; dobljenih %s bajtov, vendar je zahtevanih vsaj %s bajtov." -+msgid "" -+"Missing data when reading the %s property; got %s bytes, but %s bytes at " -+"least are needed." -+msgstr "" -+"Manjkajoči podatki med branjem lastnosti %s; dobljenih %s bajtov, vendar je " -+"zahtevanih vsaj %s bajtov." - --#: ../gsf/gsf-msole-utils.c:366 -+#: ../gsf/gsf-msole-utils.c:363 - #, c-format --msgid "Corrupt data in the VT_CF property; clipboard data length must be at least 4 bytes, but the data says it only has %s bytes available." --msgstr "Pokvarjeni podatki lastnosti VT_CF; velikost podatkov odložišča mora biti vsaj 4 bajte, podatki pa kažejo na le %s razpoložljive bajte." -+msgid "" -+"Corrupt data in the VT_CF property; clipboard data length must be at least 4 " -+"bytes, but the data says it only has %s bytes available." -+msgstr "" -+"Pokvarjeni podatki lastnosti VT_CF; velikost podatkov odložišča mora biti " -+"vsaj 4 bajte, podatki pa kažejo na le %s razpoložljive bajte." - --#: ../gsf/gsf-open-pkg-utils.c:355 -+#: ../gsf/gsf-open-pkg-utils.c:353 - #, c-format - msgid "Unable to find part id='%s' for '%s'" - msgstr "Ni mogoče najti dela id='%s' za '%s'" - --#: ../gsf/gsf-open-pkg-utils.c:383 -+#: ../gsf/gsf-open-pkg-utils.c:381 - #, c-format - msgid "Unable to find part with type='%s' for '%s'" - msgstr "Ni mogoče najti dela vrsta='%s' za '%s'" - --#: ../gsf/gsf-open-pkg-utils.c:413 -+#: ../gsf/gsf-open-pkg-utils.c:411 - #, c-format - msgid "Missing id for part in '%s'" - msgstr "Manjkajoči id za del v '%s'" - --#: ../gsf/gsf-open-pkg-utils.c:422 -+#: ../gsf/gsf-open-pkg-utils.c:420 - #, c-format - msgid "Part '%s' in '%s' from '%s' is corrupt!" - msgstr "Del '%s' v '%s' iz '%s' je pokvarjen!" - --#: ../gsf/gsf-opendoc-utils.c:353 -+#: ../gsf/gsf-opendoc-utils.c:355 - #, c-format - msgid "Property \"%s\" used for multiple types!" - msgstr "Lastnost \"%s\" je uporabljena za več vrst!" - --#: ../gsf/gsf-opendoc-utils.c:878 -+#: ../gsf/gsf-opendoc-utils.c:880 - msgid "ODF version" - msgstr "Različica ODF" - --#: ../gsf/gsf-opendoc-utils.c:879 -+#: ../gsf/gsf-opendoc-utils.c:881 - msgid "The ODF version this object is targeting as an integer like 100" --msgstr "Različica ODF, na katerega cilja predmet, določena kot celo število; na primer 100" -+msgstr "" -+"Različica ODF, na katerega cilja predmet, določena kot celo število; na " -+"primer 100" - --#: ../tools/gsf.c:27 -+#: ../tools/gsf.c:15 - msgid "Display program version" - msgstr "Pokaži različico programa" - --#: ../tools/gsf.c:54 -+#: ../tools/gsf.c:42 - #, c-format - msgid "%s: Failed to open %s: %s\n" - msgstr "%s: napaka med odpiranjem %s: %s\n" - --#: ../tools/gsf.c:75 -+#: ../tools/gsf.c:63 - #, c-format - msgid "%s: Failed to recognize %s as an archive\n" - msgstr "%s: napaka med prepoznavanjem datoteke %s kot vrste arhiva\n" - --#: ../tools/gsf.c:112 -+#: ../tools/gsf.c:100 - #, c-format - msgid "Available subcommands are...\n" - msgstr "Razpoložljivi podrejeni ukazi so ...\n" - --#: ../tools/gsf.c:113 -+#: ../tools/gsf.c:101 - #, c-format - msgid "* cat output one or more files in archive\n" - msgstr "* cat izpis enega ali več datotek v arhivu\n" - --#: ../tools/gsf.c:114 -+#: ../tools/gsf.c:102 - #, c-format - msgid "* dump dump one or more files in archive as hex\n" --msgstr "* dump izpiši enega ali več datotek v arhivu v šestnajstiškem zapisu\n" -+msgstr "" -+"* dump izpiši enega ali več datotek v arhivu v šestnajstiškem zapisu\n" - --#: ../tools/gsf.c:115 -+#: ../tools/gsf.c:103 - #, c-format - msgid "* help list subcommands\n" - msgstr "* help izpis podrejenih ukazov\n" - --#: ../tools/gsf.c:116 -+#: ../tools/gsf.c:104 - #, c-format - msgid "* list list files in archive\n" - msgstr "* list izpis datotek v arhivu\n" - --#: ../tools/gsf.c:117 -+#: ../tools/gsf.c:105 - #, c-format - msgid "* listprops list document properties in archive\n" - msgstr "* listprops izpis lastnosti dokumentov v arhivu\n" - --#: ../tools/gsf.c:118 -+#: ../tools/gsf.c:106 - #, c-format - msgid "* props print specified document properties\n" - msgstr "* props natisne določene lastnosti dokumenta\n" - --#: ../tools/gsf.c:119 -+#: ../tools/gsf.c:107 - #, c-format - msgid "* createole create OLE archive\n" - msgstr "* createole ustvari arhiv OLE\n" - --#: ../tools/gsf.c:120 -+#: ../tools/gsf.c:108 - #, c-format - msgid "* createzip create ZIP archive\n" - msgstr "* createzip ustvari arhiv ZIP\n" - --#: ../tools/gsf.c:303 -+#: ../tools/gsf.c:291 - #, c-format - msgid "No property named %s\n" - msgstr "Ni lastnosti z imenom %s\n" - --#: ../tools/gsf.c:362 -+#: ../tools/gsf.c:350 - #, c-format - msgid "%s: Error processing file %s: %s\n" - msgstr "%s: napaka med obravnavo datoteke %s: %s\n" - --#: ../tools/gsf.c:526 -+#: ../tools/gsf.c:514 - msgid "SUBCOMMAND ARCHIVE..." - msgstr "Arhiv podrejenih ukazov ..." - --#: ../tools/gsf.c:533 -+#: ../tools/gsf.c:521 - #, c-format - msgid "" - "%s\n" -@@ -190,19 +205,19 @@ msgstr "" - "%s\n" - "Zaženite '%s --help' za izpis popolnega seznama ukazov na voljo.\n" - --#: ../tools/gsf.c:540 -+#: ../tools/gsf.c:528 - #, c-format - msgid "gsf version %d.%d.%d\n" - msgstr "gsf različica %d.%d.%d\n" - --#: ../tools/gsf.c:546 -+#: ../tools/gsf.c:534 - #, c-format - msgid "Usage: %s %s\n" - msgstr "Uporaba: %s %s\n" - --#: ../tools/gsf.c:571 -+#: ../tools/gsf.c:559 - #, c-format --msgid "Run '%s help' to see a list subcommands.\n" -+msgid "Run '%s help' to see a list of subcommands.\n" - msgstr "Zaženite '%s help' za izpis seznama podrejenih ukazov.\n" - - #~ msgid "" diff --git a/debian/patches/c248f5a b/debian/patches/c248f5a deleted file mode 100644 index f71a11b..0000000 --- a/debian/patches/c248f5a +++ /dev/null @@ -1,266 +0,0 @@ -commit c248f5a21a444ae9c3ee4ba9564318a2c0d69262 -Author: Piotr Drąg -Date: Fri Mar 1 19:45:13 2013 +0100 - - Updated Polish translation - -diff --git a/po/pl.po b/po/pl.po -index e1def86..b12c2e2 100644 ---- a/po/pl.po -+++ b/po/pl.po -@@ -4,14 +4,14 @@ - # pomóc w jego rozwijaniu i pielęgnowaniu, napisz do nas: - # gnomepl@aviary.pl - # -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- --# Piotr Drąg , 2010-2012. --# Aviary.pl , 2010-2012. -+# Piotr Drąg , 2010-2013. -+# Aviary.pl , 2010-2013. - msgid "" - msgstr "" - "Project-Id-Version: libgsf\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2012-10-26 17:32+0200\n" --"PO-Revision-Date: 2012-10-26 17:33+0200\n" -+"POT-Creation-Date: 2013-03-01 19:44+0100\n" -+"PO-Revision-Date: 2013-03-01 19:45+0100\n" - "Last-Translator: Piotr Drąg \n" - "Language-Team: Polish \n" - "Language: pl\n" -@@ -23,18 +23,18 @@ msgstr "" - "X-Poedit-Language: Polish\n" - "X-Poedit-Country: Poland\n" - --#: ../gsf/gsf-blob.c:115 -+#: ../gsf/gsf-blob.c:113 - #, c-format - msgid "Not enough memory to copy %s bytes of data" - msgstr "Brak wystarczającej ilości pamięci do skopiowania %s bajtów danych" - --#: ../gsf/gsf-clip-data.c:166 -+#: ../gsf/gsf-clip-data.c:165 - #, c-format - msgid "The clip_data is in %s, but it is smaller than at least %s bytes" - msgstr "" - "clip_data znajduje się w %s, ale jest mniejsze niż co najmniej %s bajtów" - --#: ../gsf/gsf-clip-data.c:260 -+#: ../gsf/gsf-clip-data.c:259 - #, c-format - msgid "" - "The clip_data is in Windows clipboard format, but it is smaller than the " -@@ -43,36 +43,36 @@ msgstr "" - "clip_data jest w formacie schowka systemu Windows, ale jest mniejsze niż " - "wymagane 4 bajty." - --#: ../gsf/gsf-clip-data.c:271 -+#: ../gsf/gsf-clip-data.c:270 - msgid "Windows Metafile format" - msgstr "Format metapliku systemu Windows" - - #. CF_BITMAP --#: ../gsf/gsf-clip-data.c:277 -+#: ../gsf/gsf-clip-data.c:276 - msgid "Windows DIB or BITMAP format" - msgstr "Format DIB lub BITMAP systemu Windows" - --#: ../gsf/gsf-clip-data.c:282 -+#: ../gsf/gsf-clip-data.c:281 - msgid "Windows Enhanced Metafile format" - msgstr "Ulepszony format metapliku systemu Windows" - --#: ../gsf/gsf-libxml.c:1493 -+#: ../gsf/gsf-libxml.c:1497 - msgid "Pretty print" - msgstr "Ładne wyjście" - --#: ../gsf/gsf-libxml.c:1494 -+#: ../gsf/gsf-libxml.c:1498 - msgid "Should the output auto-indent elements to make reading easier?" - msgstr "Czy automatycznie wyrównywać elementy wyjścia" - --#: ../gsf/gsf-libxml.c:1500 -+#: ../gsf/gsf-libxml.c:1504 - msgid "Sink" - msgstr "Odpływ" - --#: ../gsf/gsf-libxml.c:1501 -+#: ../gsf/gsf-libxml.c:1505 - msgid "The destination for writes" - msgstr "Cel zapisu" - --#: ../gsf/gsf-msole-utils.c:315 -+#: ../gsf/gsf-msole-utils.c:312 - #, c-format - msgid "" - "Missing data when reading the %s property; got %s bytes, but %s bytes at " -@@ -81,7 +81,7 @@ msgstr "" - "Brakujące dane podczas odczytywania własności %s. Otrzymano %s bajtów, ale " - "wymagane jest co najmniej %s bajtów." - --#: ../gsf/gsf-msole-utils.c:366 -+#: ../gsf/gsf-msole-utils.c:363 - #, c-format - msgid "" - "Corrupt data in the VT_CF property; clipboard data length must be at least 4 " -@@ -90,115 +90,115 @@ msgstr "" - "Uszkodzone dane we właściwości VT_CF. Długość danych schowka musi wynosić co " - "najmniej 4 bajty, ale dane mają dostępne tylko %s bajty." - --#: ../gsf/gsf-open-pkg-utils.c:355 -+#: ../gsf/gsf-open-pkg-utils.c:353 - #, c-format - msgid "Unable to find part id='%s' for '%s'" - msgstr "Nie można odnaleźć części id=\"%s\" dla \"%s\"" - --#: ../gsf/gsf-open-pkg-utils.c:383 -+#: ../gsf/gsf-open-pkg-utils.c:381 - #, c-format - msgid "Unable to find part with type='%s' for '%s'" - msgstr "Nie można odnaleźć części z type=\"%s\" for \"%s\"" - --#: ../gsf/gsf-open-pkg-utils.c:413 -+#: ../gsf/gsf-open-pkg-utils.c:411 - #, c-format - msgid "Missing id for part in '%s'" - msgstr "Brakująca wartość id dla części w \"%s\"" - --#: ../gsf/gsf-open-pkg-utils.c:422 -+#: ../gsf/gsf-open-pkg-utils.c:420 - #, c-format - msgid "Part '%s' in '%s' from '%s' is corrupt!" - msgstr "Część \"%s\" w \"%s\" z \"%s\" jest uszkodzona." - --#: ../gsf/gsf-opendoc-utils.c:353 -+#: ../gsf/gsf-opendoc-utils.c:355 - #, c-format - msgid "Property \"%s\" used for multiple types!" - msgstr "Własność \"%s\" jest używana dla wielu typów." - --#: ../gsf/gsf-opendoc-utils.c:878 -+#: ../gsf/gsf-opendoc-utils.c:880 - msgid "ODF version" - msgstr "Wersja ODF" - --#: ../gsf/gsf-opendoc-utils.c:879 -+#: ../gsf/gsf-opendoc-utils.c:881 - msgid "The ODF version this object is targeting as an integer like 100" - msgstr "Wersja ODF tego obiektu jako liczba całkowita, taka jak 100" - --#: ../tools/gsf.c:27 -+#: ../tools/gsf.c:15 - msgid "Display program version" - msgstr "Wyświetla wersję programu" - --#: ../tools/gsf.c:54 -+#: ../tools/gsf.c:42 - #, c-format - msgid "%s: Failed to open %s: %s\n" - msgstr "%s: otwarcie %s się nie powiodło: %s\n" - --#: ../tools/gsf.c:75 -+#: ../tools/gsf.c:63 - #, c-format - msgid "%s: Failed to recognize %s as an archive\n" - msgstr "%s rozpoznanie %s jako archiwum się nie powiodło\n" - --#: ../tools/gsf.c:112 -+#: ../tools/gsf.c:100 - #, c-format - msgid "Available subcommands are...\n" - msgstr "Dostępne podpolecenia to...\n" - --#: ../tools/gsf.c:113 -+#: ../tools/gsf.c:101 - #, c-format - msgid "* cat output one or more files in archive\n" - msgstr "* cat wyświetla jeden lub więcej plików w archiwum\n" - --#: ../tools/gsf.c:114 -+#: ../tools/gsf.c:102 - #, c-format - msgid "* dump dump one or more files in archive as hex\n" - msgstr "" - "* dump zrzuca jeden lub więcej plików w archiwum w postaci " - "szesnastkowej\n" - --#: ../tools/gsf.c:115 -+#: ../tools/gsf.c:103 - #, c-format - msgid "* help list subcommands\n" - msgstr "* help wyświetla listę podpoleceń\n" - --#: ../tools/gsf.c:116 -+#: ../tools/gsf.c:104 - #, c-format - msgid "* list list files in archive\n" - msgstr "* list wyświetla listę plików w archiwum\n" - --#: ../tools/gsf.c:117 -+#: ../tools/gsf.c:105 - #, c-format - msgid "* listprops list document properties in archive\n" - msgstr "* listprops wyświetla listę właściwości dokumentu w archiwum\n" - --#: ../tools/gsf.c:118 -+#: ../tools/gsf.c:106 - #, c-format - msgid "* props print specified document properties\n" - msgstr "* props wyświetla podane właściwości dokumentu\n" - --#: ../tools/gsf.c:119 -+#: ../tools/gsf.c:107 - #, c-format - msgid "* createole create OLE archive\n" - msgstr "* createole tworzy archiwum OLE\n" - --#: ../tools/gsf.c:120 -+#: ../tools/gsf.c:108 - #, c-format - msgid "* createzip create ZIP archive\n" - msgstr "* createzip tworzy archiwum ZIP\n" - --#: ../tools/gsf.c:303 -+#: ../tools/gsf.c:291 - #, c-format - msgid "No property named %s\n" - msgstr "Brak właściwości o nazwie %s\n" - --#: ../tools/gsf.c:362 -+#: ../tools/gsf.c:350 - #, c-format - msgid "%s: Error processing file %s: %s\n" - msgstr "%s: błąd podczas przetwarzania pliku %s: %s\n" - --#: ../tools/gsf.c:526 -+#: ../tools/gsf.c:514 - msgid "SUBCOMMAND ARCHIVE..." - msgstr "PODPOLECENIE ARCHIWUM..." - --#: ../tools/gsf.c:533 -+#: ../tools/gsf.c:521 - #, c-format - msgid "" - "%s\n" -@@ -208,17 +208,17 @@ msgstr "" - "Wykonanie polecenia \"%s --help\" wyświetli listę wszystkich dostępnych " - "opcji wiersza poleceń.\n" - --#: ../tools/gsf.c:540 -+#: ../tools/gsf.c:528 - #, c-format - msgid "gsf version %d.%d.%d\n" - msgstr "gsf wersja %d.%d.%d\n" - --#: ../tools/gsf.c:546 -+#: ../tools/gsf.c:534 - #, c-format - msgid "Usage: %s %s\n" - msgstr "Użycie: %s %s\n" - --#: ../tools/gsf.c:571 -+#: ../tools/gsf.c:559 - #, c-format --msgid "Run '%s help' to see a list subcommands.\n" -+msgid "Run '%s help' to see a list of subcommands.\n" - msgstr "Wykonanie polecenia \"%s help\" wyświetli listę podpoleceń.\n" diff --git a/debian/patches/df7ab90 b/debian/patches/df7ab90 deleted file mode 100644 index 667e3ec..0000000 --- a/debian/patches/df7ab90 +++ /dev/null @@ -1,541 +0,0 @@ -Backport of -commit df7ab90d537c25507b0a7dba046380cbce31e451 -Author: Morten Welinder -Date: Fri Mar 1 13:24:34 2013 -0500 - - Introspection fixes - -diff --git a/gsf/gsf-infile-msole.c b/gsf/gsf-infile-msole.c -index 4990fcd..a6bb268 100644 ---- a/gsf/gsf-infile-msole.c -+++ b/gsf/gsf-infile-msole.c -@@ -116,15 +116,15 @@ ole_seek_block (GsfInfileMSOle const *ole, guint32 block, gsf_off_t offset) - } - - /** -- * ole_get_block : -+ * ole_get_block: (skip) - * @ole: the infile - * @block: block number -- * @buffer: optionally NULL -+ * @buffer: optionally %NULL - * - * Read a block of data from the underlying input. - * Be really anal. - * -- * Returns: pointer to the buffer or NULL if there is an error or 0 bytes are -+ * Returns: pointer to the buffer or %NULL if there is an error or 0 bytes are - * requested. - **/ - static guint8 const * -diff --git a/gsf/gsf-infile-msvba.c b/gsf/gsf-infile-msvba.c -index c187d59..3dc925b 100644 ---- a/gsf/gsf-infile-msvba.c -+++ b/gsf/gsf-infile-msvba.c -@@ -143,7 +143,7 @@ vba_extract_module_source (GsfInfileMSVBA *vba, char const *name, guint32 src_of - /** - * vba_dir_read: - * @vba: #GsfInfileMSVBA -- * @err: optionally NULL -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Read an VBA dirctory and its project file. - * along the way. -@@ -334,7 +334,7 @@ fail_stream : - /** - * vba_project_read: - * @vba: #GsfInfileMSVBA -- * @err: optionally NULL -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * - * Read an VBA dirctory and its project file. - * along the way. -@@ -544,7 +544,7 @@ gsf_infile_msvba_steal_modules (GsfInfileMSVBA *vba_stream) - * - * A utility routine that attempts to find the VBA file withint a stream. - * -- * Returns: (transfer full): a GsfInfileMSVBA *gsf_input_find_vba (GsfInput *input, GError *err); -+ * Returns: (transfer full): a GsfInfile - **/ - GsfInfileMSVBA * - gsf_input_find_vba (GsfInput *input, GError **err) -diff --git a/gsf/gsf-infile.c b/gsf/gsf-infile.c -index 4e09f8f..1aea12b 100644 ---- a/gsf/gsf-infile.c -+++ b/gsf/gsf-infile.c -@@ -62,7 +62,7 @@ gsf_infile_name_by_index (GsfInfile *infile, int i) - * @infile: #GsfInfile - * @i: target index - * -- * TODO : For 2.0 api will change to include a GError. -+ * TODO : For 2.0 api will change to include a #GError. - * Returns: (transfer full): a newly created child which must be unrefed. - **/ - GsfInput * -@@ -95,7 +95,7 @@ gsf_infile_child_by_index (GsfInfile *infile, int i) - * works for an immediate child. If you need to go several levels - * down use gsf_infile_child_by_aname, for example. - * -- * TODO : For 2.0 api will change to include a GError. -+ * TODO : For 2.0 api will change to include a #GError. - * - * Returns: (transfer full): a newly created child which must be - * unrefed. -diff --git a/gsf/gsf-input-gio.c b/gsf/gsf-input-gio.c -index 617ffd4..ed71fd4 100644 ---- a/gsf/gsf-input-gio.c -+++ b/gsf/gsf-input-gio.c -@@ -114,9 +114,9 @@ make_local_copy (GFile *file, GInputStream *stream) - /** - * gsf_input_gio_new: - * @file: -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: A new #GsfInputGio or NULL -+ * Returns: A new #GsfInputGio or %NULL - */ - GsfInput * - gsf_input_gio_new (GFile *file, GError **err) -@@ -163,9 +163,9 @@ gsf_input_gio_new (GFile *file, GError **err) - /** - * gsf_input_gio_new_for_path: - * @path: -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: A new #GsfInputGio or NULL -+ * Returns: A new #GsfInputGio or %NULL - */ - GsfInput * - gsf_input_gio_new_for_path (char const *path, GError **err) -@@ -185,9 +185,9 @@ gsf_input_gio_new_for_path (char const *path, GError **err) - /** - * gsf_input_gio_new_for_uri: - * @uri: -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: A new #GsfInputGio or NULL -+ * Returns: A new #GsfInputGio or %NULL - */ - GsfInput * - gsf_input_gio_new_for_uri (char const *uri, GError **err) -diff --git a/gsf/gsf-input-iochannel.c b/gsf/gsf-input-iochannel.c -index b12be30..778c946 100644 ---- a/gsf/gsf-input-iochannel.c -+++ b/gsf/gsf-input-iochannel.c -@@ -29,7 +29,7 @@ - * @channel: a #GIOChannel. - * @error: a #GError - * -- * Returns: a new #GsfInputMemory or NULL. -+ * Returns: a new #GsfInputMemory or %NULL. - **/ - GsfInput * - gsf_input_memory_new_from_iochannel (GIOChannel *channel, -diff --git a/gsf/gsf-input-stdio.c b/gsf/gsf-input-stdio.c -index 5c9ed13..6b534a5 100644 ---- a/gsf/gsf-input-stdio.c -+++ b/gsf/gsf-input-stdio.c -@@ -103,9 +103,9 @@ error: - /** - * gsf_input_stdio_new: - * @filename: in utf8. -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: a new file or NULL. -+ * Returns: a new file or %NULL. - **/ - /* coverity[ -tainted_string_sink_content : arg-0 ] */ - GsfInput * -diff --git a/gsf/gsf-input.c b/gsf/gsf-input.c -index f02782f..c95896e 100644 ---- a/gsf/gsf-input.c -+++ b/gsf/gsf-input.c -@@ -531,7 +531,7 @@ gsf_input_seek_emulate (GsfInput *input, gsf_off_t pos) - /** - * gsf_input_error_id: - * -- * Returns: A utility quark to flag a GError as being an input problem. -+ * Returns: A utility quark to flag a #GError as being an input problem. - */ - GQuark - gsf_input_error_id (void) -@@ -547,7 +547,7 @@ gsf_input_error_id (void) - * - * Deprecated as of GSF 1.12.0; use gsf_input_error_id() instead. - * -- * Returns: A utility quark to flag a GError as being an input problem. -+ * Returns: A utility quark to flag a #GError as being an input problem. - */ - GQuark - gsf_input_error (void) -diff --git a/gsf/gsf-libxml.c b/gsf/gsf-libxml.c -index 73b82b6..b428c1c 100644 ---- a/gsf/gsf-libxml.c -+++ b/gsf/gsf-libxml.c -@@ -358,9 +358,9 @@ gsf_xml_parser_context (GsfInput *input) - } - - /** -- * gsf_xml_output_buffer_new: -+ * gsf_xml_output_buffer_new: (skip) - * @output: #GsfOutput -- * @encoding: optionally %NULL. -+ * @handler (allow-none): - * - * This adds a reference to @output. - * This is not releated to #GsfXMLOut. -@@ -384,7 +384,7 @@ gsf_xml_output_buffer_new (GsfOutput *output, - * gsf_xmlDocFormatDump: - * @output: #GsfOutput - * @cur: #xmlDocPtr -- * @encoding: The encoding to use. -+ * @encoding: (allow-none): The encoding to use. - * @format: %TRUE to reformat the output. - * - * Dumps the document @cur into @output. -@@ -1714,13 +1714,13 @@ close_tag_if_neccessary (GsfXMLOut* xout) - /** - * gsf_xml_out_add_cstr_unchecked: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -- * @val_utf8: a utf8 encoded string to export -+ * @id: (allow-none): tag id or %NULL for content -+ * @val_utf8: (allow-none): a utf8 encoded string to export - * -- * dump @val_utf8 to an attribute named @id without checking to see if the -- * content needs escaping. A useful performance enhancement when the -- * application knows that structure of the content well. If @val_utf8 is NULL -- * do nothing (no warning, no output) -+ * dump @val_utf8 to an attribute named @id without checking to see if -+ * the content needs escaping. A useful performance enhancement when -+ * the application knows that structure of the content well. If -+ * @val_utf8 is %NULL do nothing (no warning, no output) - **/ - void - gsf_xml_out_add_cstr_unchecked (GsfXMLOut *xout, char const *id, -@@ -1741,11 +1741,11 @@ gsf_xml_out_add_cstr_unchecked (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_cstr: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -- * @val_utf8: a utf8 encoded string -+ * @id: (allow-none): tag id or %NULL for content -+ * @val_utf8: (allow-none): a utf8 encoded string - * - * dump @val_utf8 to an attribute named @id or as the nodes content escaping -- * characters as necessary. If @val_utf8 is NULL do nothing (no warning, no -+ * characters as necessary. If @val_utf8 is %NULL do nothing (no warning, no - * output) - **/ - void -@@ -1820,7 +1820,7 @@ gsf_xml_out_add_cstr (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_bool: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @val: a boolean - * - * dump boolean value @val to an attribute named @id or as the nodes content -@@ -1837,7 +1837,7 @@ gsf_xml_out_add_bool (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_int: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @val: the value - * - * dump integer value @val to an attribute named @id or as the nodes content -@@ -1854,7 +1854,7 @@ gsf_xml_out_add_int (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_uint: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @val: the value - * - * dump unsigned integer value @val to an attribute named @id or as the nodes -@@ -1872,7 +1872,7 @@ gsf_xml_out_add_uint (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_float: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @val: the value - * @precision: the number of significant digits to use, -1 meaning "enough". - * -@@ -1898,7 +1898,7 @@ gsf_xml_out_add_float (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_color: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @r: Red value - * @g: Green value - * @b: Blue value -@@ -1917,7 +1917,7 @@ gsf_xml_out_add_color (GsfXMLOut *xout, char const *id, - /** - * gsf_xml_out_add_enum: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @etype: #GType - * @val: enum element number - * -@@ -1940,7 +1940,7 @@ gsf_xml_out_add_enum (GsfXMLOut *xout, char const *id, GType etype, gint val) - /** - * gsf_xml_out_add_gvalue: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @val: #GValue - * - * Output the value of @val as a string. Does NOT store any type information -@@ -2021,11 +2021,11 @@ gsf_xml_out_add_gvalue (GsfXMLOut *xout, char const *id, GValue const *val) - /** - * gsf_xml_out_add_base64: - * @xout: #GsfXMLOut -- * @id: optionally NULL for content -+ * @id: (allow-none): tag id or %NULL for content - * @data: Data to be written - * @len: Length of data - * -- * dump @len bytes in @data into the content of node @id using base64 -+ * Dump @len bytes in @data into the content of node @id using base64 - **/ - void - gsf_xml_out_add_base64 (GsfXMLOut *xout, char const *id, -diff --git a/gsf/gsf-msole-utils.c b/gsf/gsf-msole-utils.c -index 2090ade..ec72ba2 100644 ---- a/gsf/gsf-msole-utils.c -+++ b/gsf/gsf-msole-utils.c -@@ -1103,7 +1103,7 @@ msole_prop_cmp (gconstpointer a, gconstpointer b) - * - * Since: 1.14.24 - * -- * Returns: GError which the caller must free on error. -+ * Returns: (transfer full): A #GError if there was an error. - **/ - GError * - gsf_doc_meta_data_read_from_msole (GsfDocMetaData *accum, GsfInput *in) -@@ -1319,7 +1319,7 @@ gsf_doc_meta_data_read_from_msole (GsfDocMetaData *accum, GsfInput *in) - * - * Deprecated: 1.14.24, use gsf_doc_meta_data_read_from_msole - * -- * Returns: GError which the caller must free on error. -+ * Returns: (transfer full): A #GError if there was an error. - **/ - GError * - gsf_msole_metadata_read (GsfInput *in, GsfDocMetaData *accum) -diff --git a/gsf/gsf-open-pkg-utils.c b/gsf/gsf-open-pkg-utils.c -index cad01e0..91b5083 100644 ---- a/gsf/gsf-open-pkg-utils.c -+++ b/gsf/gsf-open-pkg-utils.c -@@ -392,7 +392,7 @@ gsf_open_pkg_open_rel_by_type (GsfInput *opkg, char const *type, GError **err) - * - * Convenience function to parse a related part. - * -- * Returns: NULL on success or a GError which callerss need to free on failure. -+ * Returns: (transfer full): %NULL on success or a #GError on failure. - **/ - GError * - gsf_open_pkg_parse_rel_by_id (GsfXMLIn *xin, char const *id, -diff --git a/gsf/gsf-opendoc-utils.c b/gsf/gsf-opendoc-utils.c -index 0deac72..8555ddd 100644 ---- a/gsf/gsf-opendoc-utils.c -+++ b/gsf/gsf-opendoc-utils.c -@@ -499,9 +499,9 @@ static GsfXMLInNode const gsf_opendoc_meta_dtd[] = { - * - * Since: 1.14.24 - * -- * Returns: a GError if there is a problem. -+ * Returns: (transfer full): a #GError if there is a problem. - **/ --GError * -+GError* - gsf_doc_meta_data_read_from_odf (GsfDocMetaData *md, GsfInput *input) - { - GsfXMLInDoc *doc; -@@ -538,7 +538,7 @@ gsf_doc_meta_data_read_from_odf (GsfDocMetaData *md, GsfInput *input) - * - * Deprecated: 1.14.24, use gsf_doc_meta_data_read_from_odf - * -- * Returns: a GError if there is a problem. -+ * Returns: (transfer full): a #GError if there is a problem. - **/ - GError * - gsf_opendoc_metadata_read (GsfInput *input, GsfDocMetaData *md) -@@ -746,7 +746,7 @@ meta_write_props (char const *prop_name, GsfDocProp *prop, GsfXMLOut *output) - * - * Since: 1.14.24 - * -- * Returns: TRUE if no error occured. -+ * Returns: %TRUE if no error occured. - **/ - gboolean - gsf_doc_meta_data_write_to_odf (GsfDocMetaData const *md, gpointer output) -@@ -797,7 +797,7 @@ gsf_doc_meta_data_write_to_odf (GsfDocMetaData const *md, gpointer output) - * - * Deprecated: 1.14.24, use gsf_doc_meta_data_write_to_odf - * -- * Returns: TRUE if no error occured. -+ * Returns: %TRUE if no error occured. - **/ - gboolean - gsf_opendoc_metadata_write (gpointer output, GsfDocMetaData const *md) -diff --git a/gsf/gsf-outfile-msole.c b/gsf/gsf-outfile-msole.c -index 87ed2e1..38b4b47 100644 ---- a/gsf/gsf-outfile-msole.c -+++ b/gsf/gsf-outfile-msole.c -@@ -806,7 +806,7 @@ gsf_outfile_msole_new (GsfOutput *sink) - * - * Write @clsid to the directory associated with @ole. - * -- * Returns: TRUE on success. -+ * Returns: %TRUE on success. - **/ - gboolean - gsf_outfile_msole_set_class_id (GsfOutfileMSOle *ole, guint8 const *clsid) -diff --git a/gsf/gsf-outfile-stdio.c b/gsf/gsf-outfile-stdio.c -index e813205..834fb98 100644 ---- a/gsf/gsf-outfile-stdio.c -+++ b/gsf/gsf-outfile-stdio.c -@@ -104,11 +104,11 @@ GSF_CLASS (GsfOutfileStdio, gsf_outfile_stdio, - /** - * gsf_outfile_stdio_new_valist: - * @root: root directory in utf8. -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * @first_property_name: name of first property to set - * @var_args: a %NULL-terminated #va_list - * -- * Returns: a new outfile or NULL. -+ * Returns (transfer full): a new outfile or %NULL. - **/ - GsfOutfile * - gsf_outfile_stdio_new_valist (char const *root, GError **err, -@@ -140,12 +140,12 @@ gsf_outfile_stdio_new_valist (char const *root, GError **err, - /** - * gsf_outfile_stdio_new_full: - * @root: root directory in utf8. -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * @first_property_name: name of first property to set - * @...: value of first property, followed by more properties, - * %NULL-terminated - * -- * Returns: a new outfile or NULL. -+ * Returns (transfer full): a new outfile or %NULL. - **/ - GsfOutfile * - gsf_outfile_stdio_new_full (char const *root, GError **err, -@@ -165,9 +165,9 @@ gsf_outfile_stdio_new_full (char const *root, GError **err, - /** - * gsf_outfile_stdio_new: - * @root: root directory in utf8. -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: a new outfile or NULL. -+ * Returns: a new outfile or %NULL. - **/ - GsfOutfile * - gsf_outfile_stdio_new (char const *root, GError **err) -diff --git a/gsf/gsf-outfile.c b/gsf/gsf-outfile.c -index bff47ef..08ed232 100644 ---- a/gsf/gsf-outfile.c -+++ b/gsf/gsf-outfile.c -@@ -44,7 +44,7 @@ gsf_outfile_new_child (GsfOutfile *outfile, - * gsf_outfile_new_child_full: - * @outfile: A #GsfOutfile - * @name: The name of the new child to create -- * @is_dir: TRUE to create a directory, FALSE to create a plain file -+ * @is_dir: %TRUE to create a directory, %FALSE to create a plain file - * @first_property_name: - * @...: - * -@@ -73,7 +73,7 @@ gsf_outfile_new_child_full (GsfOutfile *outfile, - * gsf_outfile_new_child_varg: - * @outfile: A #GsfOutfile - * @name: The name of the new child to create -- * @is_dir: TRUE to create a directory, FALSE to create a plain file -+ * @is_dir: %TRUE to create a directory, %FALSE to create a plain file - * @first_property_name: - * @args: - * -diff --git a/gsf/gsf-output-gio.c b/gsf/gsf-output-gio.c -index 1d54ea2..ff5ce36 100644 ---- a/gsf/gsf-output-gio.c -+++ b/gsf/gsf-output-gio.c -@@ -59,7 +59,7 @@ wrap_if_not_seekable (GsfOutputGio *output, GError **err) - * gsf_output_gio_new_full: - * @file: an existing GFile - * -- * Returns: A new #GsfOutputGio or NULL -+ * Returns: (transfer full): A new #GsfOutputGio or %NULL - */ - static GsfOutput * - gsf_output_gio_new_full (GFile *file, GError **err) -@@ -86,7 +86,7 @@ gsf_output_gio_new_full (GFile *file, GError **err) - * gsf_output_gio_new: - * @file: an existing GFile - * -- * Returns: A new #GsfOutputGio or NULL -+ * Returns: (transfer full): A new #GsfOutputGio or %NULL - */ - GsfOutput * - gsf_output_gio_new (GFile *file) -@@ -97,9 +97,9 @@ gsf_output_gio_new (GFile *file) - /** - * gsf_output_gio_new_for_path: - * @path: -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: A new #GsfOutputGio or NULL -+ * Returns: (transfer full): A new #GsfOutputGio or %NULL - */ - GsfOutput * - gsf_output_gio_new_for_path (char const *path, GError **err) -@@ -125,9 +125,9 @@ gsf_output_gio_new_for_path (char const *path, GError **err) - /** - * gsf_output_gio_new_for_uri: - * @uri: -- * @err: optionally NULL. -+ * @err: (allow-none): place to store a #GError if anything goes wrong - * -- * Returns: A new #GsfOutputGio or NULL -+ * Returns: (transfer full): A new #GsfOutputGio or %NULL - */ - GsfOutput * - gsf_output_gio_new_for_uri (char const *uri, GError **err) -diff --git a/gsf/gsf-output-iochannel.c b/gsf/gsf-output-iochannel.c -index 3df476c..1521784 100644 ---- a/gsf/gsf-output-iochannel.c -+++ b/gsf/gsf-output-iochannel.c -@@ -37,7 +37,7 @@ typedef struct { - * gsf_output_iochannel_new: - * @channel: A #GIOChannel - * -- * Returns: a new file or NULL. -+ * Returns: (transfer full): a new file or %NULL. - **/ - GsfOutput * - gsf_output_iochannel_new (GIOChannel *channel) -diff --git a/gsf/gsf-utils.c b/gsf/gsf-utils.c -index da744fa..6f721c8 100644 ---- a/gsf/gsf-utils.c -+++ b/gsf/gsf-utils.c -@@ -720,7 +720,7 @@ gsf_base64_decode_simple (guint8 *data, size_t len) - * @p_params: a pointer to the GParameter array that holds the properties. - * (Used for both input and output. This may point to a %NULL pointer if - * there are no properties collected yet.) -- * @first_property_name: the name of the first property being set, or NULL. -+ * @first_property_name: the name of the first property being set, or %NULL. - * @var_args: a va_list holding the remainder of the property names and - * values, terminated by a %NULL. - * diff --git a/debian/patches/f7d0442 b/debian/patches/f7d0442 deleted file mode 100644 index c83c8a5..0000000 --- a/debian/patches/f7d0442 +++ /dev/null @@ -1,18 +0,0 @@ -commit f7d0442bc062a29e456e0d46038ced59855121dc -Author: Morten Welinder -Date: Fri Mar 1 10:35:26 2013 -0500 - - gsf: fix grammar in help text. - -diff --git a/tools/gsf.c b/tools/gsf.c -index f8a1ce9..304cbd6 100644 ---- a/tools/gsf.c -+++ b/tools/gsf.c -@@ -556,6 +556,6 @@ main (int argc, char **argv) - if (strcmp (cmd, "createzip") == 0) - return gsf_create (argc - 2, argv + 2, GSF_OUTFILE_TYPE_ZIP); - -- g_printerr (_("Run '%s help' to see a list subcommands.\n"), me); -+ g_printerr (_("Run '%s help' to see a list of subcommands.\n"), me); - return 1; - } diff --git a/debian/patches/refresh-config-sub-guess-1.14.26-1 b/debian/patches/refresh-config-sub-guess-1.14.26-1 deleted file mode 100644 index 0c01329..0000000 --- a/debian/patches/refresh-config-sub-guess-1.14.26-1 +++ /dev/null @@ -1,2123 +0,0 @@ -diff -ru libgsf-1.14.26.old/config.guess libgsf-1.14.26/config.guess ---- libgsf-1.14.26.old/config.guess 2012-11-14 02:47:40.000000000 +0100 -+++ libgsf-1.14.26/config.guess 2013-03-03 15:18:34.000000000 +0100 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Attempt to guess a canonical system name. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2012-02-10' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -56,8 +54,9 @@ - GNU config.guess ($timestamp) - - Originally written by Per Bothner. --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -139,22 +138,12 @@ - UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown - UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - --case "${UNAME_MACHINE}" in -- i?86) -- test -z "$VENDOR" && VENDOR=pc -- ;; -- *) -- test -z "$VENDOR" && VENDOR=unknown -- ;; --esac --test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse -- - # Note: order is significant - the case branches are not exclusive. - - case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or -- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, -+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward -@@ -190,7 +179,7 @@ - fi - ;; - *) -- os=netbsd -+ os=netbsd - ;; - esac - # The OS release -@@ -213,19 +202,19 @@ - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` -- echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE} -+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE} -+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE} -+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) -- echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE} -+ echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE} -+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in -@@ -233,7 +222,7 @@ - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) -- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` -+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on -@@ -279,7 +268,10 @@ - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- exit ;; -+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code. -+ exitcode=$? -+ trap '' 0 -+ exit $exitcode ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead -@@ -290,13 +282,13 @@ - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) -- echo m68k-${VENDOR}-sysv4 -+ echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-amigaos -+ echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-morphos -+ echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition -@@ -305,13 +297,13 @@ - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) -- echo powerpc-ibm-os400 -+ echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) -- echo arm-${VENDOR}-riscos -+ echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp -@@ -404,23 +396,23 @@ - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} -- exit ;; -+ exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) -- echo m68k-atari-mint${UNAME_RELEASE} -+ echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) -- echo m68k-milan-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-milan-mint${UNAME_RELEASE} -+ exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) -- echo m68k-hades-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-hades-mint${UNAME_RELEASE} -+ exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) -- echo m68k-${VENDOR}-mint${UNAME_RELEASE} -- exit ;; -+ echo m68k-unknown-mint${UNAME_RELEASE} -+ exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; -@@ -490,8 +482,8 @@ - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) -- # DG/UX returns AViiON for all architectures -- UNAME_PROCESSOR=`/usr/bin/uname -p` -+ # DG/UX returns AViiON for all architectures -+ UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ -@@ -504,7 +496,7 @@ - else - echo i586-dg-dgux${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; -@@ -561,7 +553,7 @@ - echo rs6000-ibm-aix3.2 - fi - exit ;; -- *:AIX:*:[456]) -+ *:AIX:*:[4567]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 -@@ -604,52 +596,52 @@ - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` -- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -- case "${sc_cpu_version}" in -- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -- 532) # CPU_PA_RISC2_0 -- case "${sc_kernel_bits}" in -- 32) HP_ARCH="hppa2.0n" ;; -- 64) HP_ARCH="hppa2.0w" ;; -+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` -+ case "${sc_cpu_version}" in -+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 -+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 -+ 532) # CPU_PA_RISC2_0 -+ case "${sc_kernel_bits}" in -+ 32) HP_ARCH="hppa2.0n" ;; -+ 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 -- esac ;; -- esac -+ esac ;; -+ esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build -- sed 's/^ //' << EOF >$dummy.c -+ sed 's/^ //' << EOF >$dummy.c -+ -+ #define _HPUX_SOURCE -+ #include -+ #include - -- #define _HPUX_SOURCE -- #include -- #include -- -- int main () -- { -- #if defined(_SC_KERNEL_BITS) -- long bits = sysconf(_SC_KERNEL_BITS); -- #endif -- long cpu = sysconf (_SC_CPU_VERSION); -- -- switch (cpu) -- { -- case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -- case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -- case CPU_PA_RISC2_0: -- #if defined(_SC_KERNEL_BITS) -- switch (bits) -- { -- case 64: puts ("hppa2.0w"); break; -- case 32: puts ("hppa2.0n"); break; -- default: puts ("hppa2.0"); break; -- } break; -- #else /* !defined(_SC_KERNEL_BITS) */ -- puts ("hppa2.0"); break; -- #endif -- default: puts ("hppa1.0"); break; -- } -- exit (0); -- } -+ int main () -+ { -+ #if defined(_SC_KERNEL_BITS) -+ long bits = sysconf(_SC_KERNEL_BITS); -+ #endif -+ long cpu = sysconf (_SC_CPU_VERSION); -+ -+ switch (cpu) -+ { -+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break; -+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break; -+ case CPU_PA_RISC2_0: -+ #if defined(_SC_KERNEL_BITS) -+ switch (bits) -+ { -+ case 64: puts ("hppa2.0w"); break; -+ case 32: puts ("hppa2.0n"); break; -+ default: puts ("hppa2.0"); break; -+ } break; -+ #else /* !defined(_SC_KERNEL_BITS) */ -+ puts ("hppa2.0"); break; -+ #endif -+ default: puts ("hppa1.0"); break; -+ } -+ exit (0); -+ } - EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa -@@ -730,9 +722,9 @@ - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then -- echo ${UNAME_MACHINE}-${VENDOR}-osf1mk -+ echo ${UNAME_MACHINE}-unknown-osf1mk - else -- echo ${UNAME_MACHINE}-${VENDOR}-osf1 -+ echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) -@@ -740,22 +732,22 @@ - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd -- exit ;; -+ exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi -- exit ;; -+ exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd -- exit ;; -+ exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd -- exit ;; -+ exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd -- exit ;; -+ exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; -@@ -779,32 +771,31 @@ - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -- exit ;; -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` -+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ exit ;; - 5000:UNIX_System_V:4.*:*) -- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" -+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` -+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` -+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) -- echo sparc-${VENDOR}-bsdi${UNAME_RELEASE} -+ echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE} -+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) -- case ${UNAME_MACHINE} in -- pc98) -- echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ UNAME_PROCESSOR=`/usr/bin/uname -p` -+ case ${UNAME_PROCESSOR} in - amd64) -- echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) -- echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; -+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) -@@ -813,23 +804,26 @@ - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -+ i*:MSYS*:*) -+ echo ${UNAME_MACHINE}-pc-msys -+ exit ;; - i*:windows32*:*) -- # uname -m includes "-pc" on this system. -- echo ${UNAME_MACHINE}-mingw32 -+ # uname -m includes "-pc" on this system. -+ echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:*) -- case ${UNAME_MACHINE} in -+ case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - authenticamd | genuineintel | EM64T) -- echo x86_64-${VENDOR}-interix${UNAME_RELEASE} -+ echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) -- echo ia64-${VENDOR}-interix${UNAME_RELEASE} -+ echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) -@@ -848,25 +842,32 @@ - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) -- echo x86_64-${VENDOR}-cygwin -+ echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) -- echo powerpcle-${VENDOR}-cygwin -+ echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) -- echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` -+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system -- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` -+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland -- echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu -+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -876,32 +877,41 @@ - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; -- esac -+ esac - objdump --private-headers /bin/sh | grep -q ld.so.1 - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC} -+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - else -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi -+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ -+ | grep -q __ARM_PCS_VFP -+ then -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi -+ else -+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf -+ fi - fi - exit ;; - avr32*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) -- echo cris-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) -- echo crisv32-axis-linux-gnu -+ echo ${UNAME_MACHINE}-axis-linux-gnu - exit ;; - frv:Linux:*:*) -- echo frv-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ hexagon:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - LIBC=gnu -@@ -912,16 +922,16 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` -- echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" -+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit ;; - ia64:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:* | mips64:Linux:*:*) - eval $set_cc_for_build -@@ -940,51 +950,54 @@ - #endif - EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` -- test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; } -+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) -- echo or32-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - padre:Linux:*:*) -- echo sparc-${VENDOR}-linux-gnu -+ echo sparc-unknown-linux-gnu - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) -- echo hppa64-${VENDOR}-linux-gnu -+ echo hppa64-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in -- PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;; -- PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;; -- *) echo hppa-${VENDOR}-linux-gnu ;; -+ PA7*) echo hppa1.1-unknown-linux-gnu ;; -+ PA8*) echo hppa2.0-unknown-linux-gnu ;; -+ *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - ppc64:Linux:*:*) -- echo powerpc64-${VENDOR}-linux-gnu -+ echo powerpc64-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) -- echo powerpc-${VENDOR}-linux-gnu -+ echo powerpc-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ tile*:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) -- echo x86_64-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu -+ echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. -@@ -993,11 +1006,11 @@ - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) -- # Unixware is an offshoot of SVR4, but it has its own version -- # number series starting with 2... -- # I am not positive that other SVR4 systems won't match this, -+ # Unixware is an offshoot of SVR4, but it has its own version -+ # number series starting with 2... -+ # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. -- # Use sysv4.2uw... so that sysv4* matches it. -+ # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) -@@ -1006,16 +1019,16 @@ - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) -- echo ${UNAME_MACHINE}-${VENDOR}-stop -+ echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-atheos -+ echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) -- echo i386-${VENDOR}-lynxos${UNAME_RELEASE} -+ echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp -@@ -1029,13 +1042,13 @@ - fi - exit ;; - i*86:*:5:[678]*) -- # UnixWare 7.x, OpenUNIX and OpenServer 6. -+ # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac -- echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} -+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then -@@ -1057,13 +1070,13 @@ - exit ;; - pc:*:*:*) - # Left here for compatibility: -- # uname -m prints for DJGPP always 'pc', but it prints nothing about -- # the processor, so we play safe by assuming i586. -+ # uname -m prints for DJGPP always 'pc', but it prints nothing about -+ # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp -- exit ;; -+ exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; -@@ -1074,7 +1087,7 @@ - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. -- echo i860-${VENDOR}-sysv${UNAME_RELEASE} # Unknown i860-SVR4 -+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) -@@ -1098,8 +1111,8 @@ - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) -- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -- && { echo i486-ncr-sysv4; exit; } ;; -+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ -+ && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ -@@ -1111,19 +1124,19 @@ - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) -- echo m68k-${VENDOR}-lynxos${UNAME_RELEASE} -+ echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) -- echo sparc-${VENDOR}-lynxos${UNAME_RELEASE} -+ echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) -- echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE} -+ echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) -- echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE} -+ echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} -@@ -1142,10 +1155,10 @@ - echo ns32k-sni-sysv - fi - exit ;; -- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -- # says -- echo i586-unisys-sysv4 -- exit ;; -+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort -+ # says -+ echo i586-unisys-sysv4 -+ exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm -@@ -1171,11 +1184,11 @@ - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then -- echo mips-nec-sysv${UNAME_RELEASE} -+ echo mips-nec-sysv${UNAME_RELEASE} - else -- echo mips-${VENDOR}-sysv${UNAME_RELEASE} -+ echo mips-unknown-sysv${UNAME_RELEASE} - fi -- exit ;; -+ exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; -@@ -1240,6 +1253,9 @@ - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; -+ NEO-?:NONSTOP_KERNEL:*:*) -+ echo neo-tandem-nsk${UNAME_RELEASE} -+ exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; -@@ -1264,13 +1280,13 @@ - else - UNAME_MACHINE="$cputype" - fi -- echo ${UNAME_MACHINE}-${VENDOR}-plan9 -+ echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) -- echo pdp10-${VENDOR}-tops10 -+ echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) -- echo pdp10-${VENDOR}-tenex -+ echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 -@@ -1279,19 +1295,19 @@ - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) -- echo pdp10-${VENDOR}-tops20 -+ echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) -- echo pdp10-${VENDOR}-its -+ echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) -- echo mips-sei-seiux${UNAME_RELEASE} -+ echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) -- echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` -+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) -- UNAME_MACHINE=`(uname -p) 2>/dev/null` -+ UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; -@@ -1309,6 +1325,9 @@ - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - - #echo '(No uname command or uname output not recognized.)' 1>&2 -@@ -1331,11 +1350,11 @@ - #include - printf ("m68k-sony-newsos%s\n", - #ifdef NEWSOS4 -- "4" -+ "4" - #else -- "" -+ "" - #endif -- ); exit (0); -+ ); exit (0); - #endif - #endif - -diff -ru libgsf-1.14.26.old/config.sub libgsf-1.14.26/config.sub ---- libgsf-1.14.26.old/config.sub 2012-11-14 02:47:40.000000000 +0100 -+++ libgsf-1.14.26/config.sub 2013-03-03 15:18:34.000000000 +0100 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Configuration validation subroutine script. - # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, --# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 --# Free Software Foundation, Inc. -+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - --timestamp='2009-11-20' -+timestamp='2012-04-18' - - # This file is (in principle) common to ALL GNU software. - # The presence of a machine in this file suggests that SOME GNU software -@@ -21,9 +21,7 @@ - # GNU General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -75,8 +73,9 @@ - version="\ - GNU config.sub ($timestamp) - --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, --2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+Free Software Foundation, Inc. - - This is free software; see the source for copying conditions. There is NO - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." -@@ -123,13 +122,18 @@ - # Here we must recognize all the valid KERNEL-OS combinations. - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in -- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ -- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ -+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -156,8 +160,8 @@ - os= - basic_machine=$1 - ;; -- -bluegene*) -- os=-cnk -+ -bluegene*) -+ os=-cnk - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= -@@ -173,10 +177,10 @@ - os=-chorusos - basic_machine=$1 - ;; -- -chorusrdb) -- os=-chorusrdb -+ -chorusrdb) -+ os=-chorusrdb - basic_machine=$1 -- ;; -+ ;; - -hiux*) - os=-hiuxwe2 - ;; -@@ -221,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -245,17 +255,22 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ -+ | be32 | be64 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ -+ | epiphany \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ -+ | hexagon \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ -+ | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ -@@ -281,29 +296,39 @@ - | moxie \ - | mt \ - | msp430 \ -+ | nds32 | nds32le | nds32be \ - | nios | nios2 \ - | ns16k | ns32k \ -+ | open8 \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ -- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ -+ | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pyramid \ -- | rx \ -+ | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ -- | spu | strongarm \ -- | tahoe | thumb | tic4x | tic80 | tron \ -+ | spu \ -+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ -- | v850 | v850e \ -+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | we32k \ -- | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ -+ | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -- # Motorola 68HC11/12. -+ c54x) -+ basic_machine=tic54x-unknown -+ ;; -+ c55x) -+ basic_machine=tic55x-unknown -+ ;; -+ c6x) -+ basic_machine=tic6x-unknown -+ ;; -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -313,6 +338,21 @@ - basic_machine=mt-unknown - ;; - -+ strongarm | thumb | xscale) -+ basic_machine=arm-unknown -+ ;; -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; -+ xscaleeb) -+ basic_machine=armeb-unknown -+ ;; -+ -+ xscaleel) -+ basic_machine=armel-unknown -+ ;; -+ - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. -@@ -327,21 +367,25 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ -+ | be32-* | be64-* \ - | bfin-* | bs2000-* \ -- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ -+ | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ -+ | hexagon-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ -+ | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -@@ -367,25 +411,29 @@ - | mmix-* \ - | mt-* \ - | msp430-* \ -+ | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ -+ | open8-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ -- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ -+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pyramid-* \ -- | romp-* | rs6000-* | rx-* \ -+ | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ -- | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ -- | tahoe-* | thumb-* \ -- | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ -+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ -+ | tahoe-* \ -+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ -+ | tile*-* \ - | tron-* \ - | ubicom32-* \ -- | v850-* | v850e-* | vax-* \ -+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ -+ | vax-* \ - | we32k-* \ -- | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ -+ | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) -@@ -410,7 +458,7 @@ - basic_machine=a29k-amd - os=-udi - ;; -- abacus) -+ abacus) - basic_machine=abacus-unknown - ;; - adobe68k) -@@ -480,11 +528,20 @@ - basic_machine=powerpc-ibm - os=-cnk - ;; -+ c54x-*) -+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c55x-*) -+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; -+ c6x-*) -+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; -- cegcc) -+ cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; -@@ -516,7 +573,7 @@ - basic_machine=craynv-cray - os=-unicosmp - ;; -- cr16) -+ cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; -@@ -674,7 +731,6 @@ - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; --# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 -@@ -732,7 +788,7 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze) - basic_machine=microblaze-xilinx - ;; - mingw32) -@@ -771,10 +827,18 @@ - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; -+ msys) -+ basic_machine=i386-pc -+ os=-msys -+ ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; -+ nacl) -+ basic_machine=le32-unknown -+ os=-nacl -+ ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 -@@ -839,6 +903,12 @@ - np1) - basic_machine=np1-gould - ;; -+ neo-tandem) -+ basic_machine=neo-tandem -+ ;; -+ nse-tandem) -+ basic_machine=nse-tandem -+ ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; -@@ -921,9 +991,10 @@ - ;; - power) basic_machine=power-ibm - ;; -- ppc) basic_machine=powerpc-unknown -+ ppc | ppcbe) basic_machine=powerpc-unknown - ;; -- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ppc-* | ppcbe-*) -+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown -@@ -1017,6 +1088,9 @@ - basic_machine=i860-stratus - os=-sysv4 - ;; -+ strongarm-* | thumb-*) -+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` -+ ;; - sun2) - basic_machine=m68000-sun - ;; -@@ -1073,20 +1147,8 @@ - basic_machine=t90-cray - os=-unicos - ;; -- tic54x | c54x*) -- basic_machine=tic54x-unknown -- os=-coff -- ;; -- tic55x | c55x*) -- basic_machine=tic55x-unknown -- os=-coff -- ;; -- tic6x | c6x*) -- basic_machine=tic6x-unknown -- os=-coff -- ;; - tile*) -- basic_machine=tile-unknown -+ basic_machine=$basic_machine-unknown - os=-linux-gnu - ;; - tx39) -@@ -1156,6 +1218,9 @@ - xps | xps100) - basic_machine=xps100-honeywell - ;; -+ xscale-* | xscalee[bl]-*) -+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` -+ ;; - ymp) - basic_machine=ymp-cray - os=-unicos -@@ -1253,11 +1318,11 @@ - if [ x"$os" != x"" ] - then - case $os in -- # First match some system type aliases -- # that might get confused with valid system types. -+ # First match some system type aliases -+ # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. -- -auroraux) -- os=-auroraux -+ -auroraux) -+ os=-auroraux - ;; - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` -@@ -1293,8 +1358,9 @@ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ -- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ -+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -+ | -mingw32* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1341,7 +1407,7 @@ - -opened*) - os=-openedition - ;; -- -os400*) -+ -os400*) - os=-os400 - ;; - -wince*) -@@ -1390,7 +1456,7 @@ - -sinix*) - os=-sysv4 - ;; -- -tpf*) -+ -tpf*) - os=-tpf - ;; - -triton*) -@@ -1435,6 +1501,8 @@ - -dicos*) - os=-dicos - ;; -+ -nacl*) -+ ;; - -none) - ;; - *) -@@ -1457,10 +1525,10 @@ - # system, and we'll never get to this point. - - case $basic_machine in -- score-*) -+ score-*) - os=-elf - ;; -- spu-*) -+ spu-*) - os=-elf - ;; - *-acorn) -@@ -1472,8 +1540,20 @@ - arm*-semi) - os=-aout - ;; -- c4x-* | tic4x-*) -- os=-coff -+ c4x-* | tic4x-*) -+ os=-coff -+ ;; -+ hexagon-*) -+ os=-elf -+ ;; -+ tic54x-*) -+ os=-coff -+ ;; -+ tic55x-*) -+ os=-coff -+ ;; -+ tic6x-*) -+ os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) -@@ -1493,14 +1573,11 @@ - ;; - m68000-sun) - os=-sunos3 -- # This also exists in the configure program, but was not the -- # default. -- # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; -- mep-*) -+ mep-*) - os=-elf - ;; - mips*-cisco) -@@ -1527,7 +1604,7 @@ - *-ibm) - os=-aix - ;; -- *-knuth) -+ *-knuth) - os=-mmixware - ;; - *-wec) -diff -ru libgsf-1.14.26.old/configure libgsf-1.14.26/configure ---- libgsf-1.14.26.old/configure 2013-02-27 23:41:14.000000000 +0100 -+++ libgsf-1.14.26/configure 2013-03-03 15:18:32.000000000 +0100 -@@ -5026,7 +5026,8 @@ - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -- if test -n "$lt_cv_sys_max_cmd_len"; then -+ if test -n "$lt_cv_sys_max_cmd_len" && \ -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else -@@ -5424,10 +5425,6 @@ - fi - ;; - --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- - haiku*) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -5466,7 +5463,7 @@ - ;; - - # This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -6561,7 +6558,14 @@ - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -+ case `/usr/bin/file conftest.o` in -+ *x86-64*) -+ LD="${LD-ld} -m elf32_x86_64" -+ ;; -+ *) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ esac - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" -@@ -8688,7 +8692,7 @@ - lt_prog_compiler_static='-non_shared' - ;; - -- linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) -@@ -10858,17 +10862,6 @@ - esac - ;; - --gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- - haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no -@@ -10985,7 +10978,7 @@ - ;; - - # This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -diff -ru libgsf-1.14.26.old/depcomp libgsf-1.14.26/depcomp ---- libgsf-1.14.26.old/depcomp 2012-11-14 02:47:42.000000000 +0100 -+++ libgsf-1.14.26/depcomp 2013-03-03 15:18:35.000000000 +0100 -@@ -1,10 +1,10 @@ - #! /bin/sh - # depcomp - compile a program generating dependencies as side-effects - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2012-03-27.16; # UTC - --# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free --# Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010, -+# 2011, 2012 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -28,7 +28,7 @@ - - case $1 in - '') -- echo "$0: No command. Try \`$0 --help' for more information." 1>&2 -+ echo "$0: No command. Try '$0 --help' for more information." 1>&2 - exit 1; - ;; - -h | --h*) -@@ -40,11 +40,11 @@ - - Environment variables: - depmode Dependency tracking mode. -- source Source file read by `PROGRAMS ARGS'. -- object Object file output by `PROGRAMS ARGS'. -+ source Source file read by 'PROGRAMS ARGS'. -+ object Object file output by 'PROGRAMS ARGS'. - DEPDIR directory where to store dependencies. - depfile Dependency file to output. -- tmpdepfile Temporary file to use when outputing dependencies. -+ tmpdepfile Temporary file to use when outputting dependencies. - libtool Whether libtool is used (yes/no). - - Report bugs to . -@@ -57,6 +57,12 @@ - ;; - esac - -+# A tabulation character. -+tab=' ' -+# A newline character. -+nl=' -+' -+ - if test -z "$depmode" || test -z "$source" || test -z "$object"; then - echo "depcomp: Variables source, object and depmode must be set" 1>&2 - exit 1 -@@ -90,10 +96,24 @@ - # This is just like msvisualcpp but w/o cygpath translation. - # Just convert the backslash-escaped backslashes to single forward - # slashes to satisfy depend.m4 -- cygpath_u="sed s,\\\\\\\\,/,g" -+ cygpath_u='sed s,\\\\,/,g' - depmode=msvisualcpp - fi - -+if test "$depmode" = msvc7msys; then -+ # This is just like msvc7 but w/o cygpath translation. -+ # Just convert the backslash-escaped backslashes to single forward -+ # slashes to satisfy depend.m4 -+ cygpath_u='sed s,\\\\,/,g' -+ depmode=msvc7 -+fi -+ -+if test "$depmode" = xlc; then -+ # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. -+ gccflag=-qmakedep=gcc,-MF -+ depmode=gcc -+fi -+ - case "$depmode" in - gcc3) - ## gcc 3 implements dependency tracking that does exactly what -@@ -148,20 +168,21 @@ - ## The second -e expression handles DOS-style file names with drive letters. - sed -e 's/^[^:]*: / /' \ - -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" --## This next piece of magic avoids the `deleted header file' problem. -+## This next piece of magic avoids the "deleted header file" problem. - ## The problem is that when a header file which appears in a .P file - ## is deleted, the dependency causes make to die (because there is - ## typically no way to rebuild the header). We avoid this by adding - ## dummy dependencies for each header file. Too bad gcc doesn't do - ## this for us directly. -- tr ' ' ' --' < "$tmpdepfile" | --## Some versions of gcc put a space before the `:'. On the theory -+ tr ' ' "$nl" < "$tmpdepfile" | -+## Some versions of gcc put a space before the ':'. On the theory - ## that the space means something, we add a space to the output as --## well. -+## well. hp depmode also adds that space, but also prefixes the VPATH -+## to the object. Take care to not repeat it in the output. - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. -- sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -+ sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ -+ | sed -e 's/$/ :/' >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -193,18 +214,15 @@ - # clever and replace this with sed code, as IRIX sed won't handle - # lines with more than a fixed number of characters (4096 in - # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; -- # the IRIX cc adds comments like `#:fec' to the end of the -+ # the IRIX cc adds comments like '#:fec' to the end of the - # dependency line. -- tr ' ' ' --' < "$tmpdepfile" \ -+ tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ -- tr ' --' ' ' >> "$depfile" -+ tr "$nl" ' ' >> "$depfile" - echo >> "$depfile" - - # The second pass generates a dummy entry for each header file. -- tr ' ' ' --' < "$tmpdepfile" \ -+ tr ' ' "$nl" < "$tmpdepfile" \ - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> "$depfile" - else -@@ -216,10 +234,17 @@ - rm -f "$tmpdepfile" - ;; - -+xlc) -+ # This case exists only to let depend.m4 do its work. It works by -+ # looking at the text of this script. This case will never be run, -+ # since it is checked for above. -+ exit 1 -+ ;; -+ - aix) - # The C for AIX Compiler uses -M and outputs the dependencies - # in a .u file. In older versions, this file always lives in the -- # current directory. Also, the AIX compiler puts `$object:' at the -+ # current directory. Also, the AIX compiler puts '$object:' at the - # start of each line; $object doesn't have directory information. - # Version 6 uses the directory in both cases. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` -@@ -249,12 +274,11 @@ - test -f "$tmpdepfile" && break - done - if test -f "$tmpdepfile"; then -- # Each line is of the form `foo.o: dependent.h'. -+ # Each line is of the form 'foo.o: dependent.h'. - # Do two passes, one to just change these to -- # `$object: dependent.h' and one to simply `dependent.h:'. -+ # '$object: dependent.h' and one to simply 'dependent.h:'. - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a tab and a space in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - # The sourcefile does not contain any dependencies, so just - # store a dummy comment line, to avoid errors with the Makefile -@@ -265,23 +289,26 @@ - ;; - - icc) -- # Intel's C compiler understands `-MD -MF file'. However on -- # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c -+ # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. -+ # However on -+ # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c - # ICC 7.0 will fill foo.d with something like - # foo.o: sub/foo.c - # foo.o: sub/foo.h -- # which is wrong. We want: -+ # which is wrong. We want - # sub/foo.o: sub/foo.c - # sub/foo.o: sub/foo.h - # sub/foo.c: - # sub/foo.h: - # ICC 7.1 will output - # foo.o: sub/foo.c sub/foo.h -- # and will wrap long lines using \ : -+ # and will wrap long lines using '\': - # foo.o: sub/foo.c ... \ - # sub/foo.h ... \ - # ... -- -+ # tcc 0.9.26 (FIXME still under development at the moment of writing) -+ # will emit a similar output, but also prepend the continuation lines -+ # with horizontal tabulation characters. - "$@" -MD -MF "$tmpdepfile" - stat=$? - if test $stat -eq 0; then : -@@ -290,15 +317,21 @@ - exit $stat - fi - rm -f "$depfile" -- # Each line is of the form `foo.o: dependent.h', -- # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. -+ # Each line is of the form 'foo.o: dependent.h', -+ # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. - # Do two passes, one to just change these to -- # `$object: dependent.h' and one to simply `dependent.h:'. -- sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" -- # Some versions of the HPUX 10.20 sed can't process this invocation -- # correctly. Breaking it into two sed invocations is a workaround. -- sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" | -- sed -e 's/$/ :/' >> "$depfile" -+ # '$object: dependent.h' and one to simply 'dependent.h:'. -+ sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ -+ < "$tmpdepfile" > "$depfile" -+ sed ' -+ s/[ '"$tab"'][ '"$tab"']*/ /g -+ s/^ *// -+ s/ *\\*$// -+ s/^[^:]*: *// -+ /^$/d -+ /:$/d -+ s/$/ :/ -+ ' < "$tmpdepfile" >> "$depfile" - rm -f "$tmpdepfile" - ;; - -@@ -334,7 +367,7 @@ - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" -- # Add `dependent.h:' lines. -+ # Add 'dependent.h:' lines. - sed -ne '2,${ - s/^ *// - s/ \\*$// -@@ -349,9 +382,9 @@ - - tru64) - # The Tru64 compiler uses -MD to generate dependencies as a side -- # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'. -+ # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put -- # dependencies in `foo.d' instead, so we check for that too. -+ # dependencies in 'foo.d' instead, so we check for that too. - # Subdirectories are respected. - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` - test "x$dir" = "x$object" && dir= -@@ -397,14 +430,59 @@ - done - if test -f "$tmpdepfile"; then - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" -- # That's a tab and a space in the []. -- sed -e 's,^.*\.[a-z]*:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" -+ sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" - else - echo "#dummy" > "$depfile" - fi - rm -f "$tmpdepfile" - ;; - -+msvc7) -+ if test "$libtool" = yes; then -+ showIncludes=-Wc,-showIncludes -+ else -+ showIncludes=-showIncludes -+ fi -+ "$@" $showIncludes > "$tmpdepfile" -+ stat=$? -+ grep -v '^Note: including file: ' "$tmpdepfile" -+ if test "$stat" = 0; then : -+ else -+ rm -f "$tmpdepfile" -+ exit $stat -+ fi -+ rm -f "$depfile" -+ echo "$object : \\" > "$depfile" -+ # The first sed program below extracts the file names and escapes -+ # backslashes for cygpath. The second sed program outputs the file -+ # name when reading, but also accumulates all include files in the -+ # hold buffer in order to output them again at the end. This only -+ # works with sed implementations that can handle large buffers. -+ sed < "$tmpdepfile" -n ' -+/^Note: including file: *\(.*\)/ { -+ s//\1/ -+ s/\\/\\\\/g -+ p -+}' | $cygpath_u | sort -u | sed -n ' -+s/ /\\ /g -+s/\(.*\)/'"$tab"'\1 \\/p -+s/.\(.*\) \\/\1:/ -+H -+$ { -+ s/.*/'"$tab"'/ -+ G -+ p -+}' >> "$depfile" -+ rm -f "$tmpdepfile" -+ ;; -+ -+msvc7msys) -+ # This case exists only to let depend.m4 do its work. It works by -+ # looking at the text of this script. This case will never be run, -+ # since it is checked for above. -+ exit 1 -+ ;; -+ - #nosideeffect) - # This comment above is used by automake to tell side-effect - # dependency tracking mechanisms from slower ones. -@@ -422,7 +500,7 @@ - shift - fi - -- # Remove `-o $object'. -+ # Remove '-o $object'. - IFS=" " - for arg - do -@@ -442,15 +520,14 @@ - done - - test -z "$dashmflag" && dashmflag=-M -- # Require at least two characters before searching for `:' -+ # Require at least two characters before searching for ':' - # in the target name. This is to cope with DOS-style filenames: -- # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise. -+ # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. - "$@" $dashmflag | -- sed 's:^[ ]*[^: ][^:][^:]*\:[ ]*:'"$object"'\: :' > "$tmpdepfile" -+ sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" - rm -f "$depfile" - cat < "$tmpdepfile" > "$depfile" -- tr ' ' ' --' < "$tmpdepfile" | \ -+ tr ' ' "$nl" < "$tmpdepfile" | \ - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -@@ -503,9 +580,10 @@ - touch "$tmpdepfile" - ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" - rm -f "$depfile" -- cat < "$tmpdepfile" > "$depfile" -- sed '1,2d' "$tmpdepfile" | tr ' ' ' --' | \ -+ # makedepend may prepend the VPATH from the source file name to the object. -+ # No need to regex-escape $object, excess matching of '.' is harmless. -+ sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" -+ sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ - ## Some versions of the HPUX 10.20 sed can't process this invocation - ## correctly. Breaking it into two sed invocations is a workaround. - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" -@@ -525,7 +603,7 @@ - shift - fi - -- # Remove `-o $object'. -+ # Remove '-o $object'. - IFS=" " - for arg - do -@@ -594,8 +672,8 @@ - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" - rm -f "$depfile" - echo "$object : \\" > "$depfile" -- sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" -- echo " " >> "$depfile" -+ sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile" -+ echo "$tab" >> "$depfile" - sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" - rm -f "$tmpdepfile" - ;; -diff -ru libgsf-1.14.26.old/install-sh libgsf-1.14.26/install-sh ---- libgsf-1.14.26.old/install-sh 2012-11-14 02:47:40.000000000 +0100 -+++ libgsf-1.14.26/install-sh 2013-03-03 15:18:34.000000000 +0100 -@@ -1,7 +1,7 @@ - #!/bin/sh - # install - install a program, script, or datafile - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2011-01-19.21; # UTC - - # This originates from X11R5 (mit/util/scripts/install.sh), which was - # later released in X11R6 (xc/config/util/install.sh) with the -@@ -156,6 +156,10 @@ - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 -+ # Protect names problematic for `test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - shift;; - - -T) no_target_directory=true;; -@@ -186,6 +190,10 @@ - fi - shift # arg - dst_arg=$arg -+ # Protect names problematic for `test' and other utilities. -+ case $dst_arg in -+ -* | [=\(\)!]) dst_arg=./$dst_arg;; -+ esac - done - fi - -@@ -200,7 +208,11 @@ - fi - - if test -z "$dir_arg"; then -- trap '(exit $?); exit' 1 2 13 15 -+ do_exit='(exit $ret); exit $ret' -+ trap "ret=129; $do_exit" 1 -+ trap "ret=130; $do_exit" 2 -+ trap "ret=141; $do_exit" 13 -+ trap "ret=143; $do_exit" 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. -@@ -228,9 +240,9 @@ - - for src - do -- # Protect names starting with `-'. -+ # Protect names problematic for `test' and other utilities. - case $src in -- -*) src=./$src;; -+ -* | [=\(\)!]) src=./$src;; - esac - - if test -n "$dir_arg"; then -@@ -252,12 +264,7 @@ - echo "$0: no destination specified." >&2 - exit 1 - fi -- - dst=$dst_arg -- # Protect names starting with `-'. -- case $dst in -- -*) dst=./$dst;; -- esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. -@@ -385,7 +392,7 @@ - - case $dstdir in - /*) prefix='/';; -- -*) prefix='./';; -+ [-=\(\)!]*) prefix='./';; - *) prefix='';; - esac - -@@ -403,7 +410,7 @@ - - for d - do -- test -z "$d" && continue -+ test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then -diff -ru libgsf-1.14.26.old/ltmain.sh libgsf-1.14.26/ltmain.sh ---- libgsf-1.14.26.old/ltmain.sh 2013-02-27 23:41:09.000000000 +0100 -+++ libgsf-1.14.26/ltmain.sh 2013-03-03 15:18:20.000000000 +0100 -@@ -70,7 +70,7 @@ - # compiler: $LTCC - # compiler flags: $LTCFLAGS - # linker: $LD (gnu? $with_gnu_ld) --# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1ubuntu2 -+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2 - # automake: $automake_version - # autoconf: $autoconf_version - # -@@ -80,7 +80,7 @@ - - PROGRAM=libtool - PACKAGE=libtool --VERSION="2.4.2 Debian-2.4.2-1ubuntu2" -+VERSION="2.4.2 Debian-2.4.2-1.2" - TIMESTAMP="" - package_revision=1.3337 - -diff -ru libgsf-1.14.26.old/m4/libtool.m4 libgsf-1.14.26/m4/libtool.m4 ---- libgsf-1.14.26.old/m4/libtool.m4 2013-02-27 23:41:09.000000000 +0100 -+++ libgsf-1.14.26/m4/libtool.m4 2013-03-03 15:18:20.000000000 +0100 -@@ -1324,7 +1324,14 @@ - LD="${LD-ld} -m elf_i386_fbsd" - ;; - x86_64-*linux*) -- LD="${LD-ld} -m elf_i386" -+ case `/usr/bin/file conftest.o` in -+ *x86-64*) -+ LD="${LD-ld} -m elf32_x86_64" -+ ;; -+ *) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ esac - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" -@@ -1688,7 +1695,8 @@ - ;; - *) - lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -- if test -n "$lt_cv_sys_max_cmd_len"; then -+ if test -n "$lt_cv_sys_max_cmd_len" && \ -+ test undefined != "$lt_cv_sys_max_cmd_len"; then - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` - else -@@ -2512,17 +2520,6 @@ - esac - ;; - --gnu*) -- version_type=linux # correct to gnu/linux during the next big refactor -- need_lib_prefix=no -- need_version=no -- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -- soname_spec='${libname}${release}${shared_ext}$major' -- shlibpath_var=LD_LIBRARY_PATH -- shlibpath_overrides_runpath=no -- hardcode_into_libs=yes -- ;; -- - haiku*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no -@@ -2639,7 +2636,7 @@ - ;; - - # This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - version_type=linux # correct to gnu/linux during the next big refactor - need_lib_prefix=no - need_version=no -@@ -3255,10 +3252,6 @@ - fi - ;; - --gnu*) -- lt_cv_deplibs_check_method=pass_all -- ;; -- - haiku*) - lt_cv_deplibs_check_method=pass_all - ;; -@@ -3297,7 +3290,7 @@ - ;; - - # This must be glibc/ELF. --linux* | k*bsd*-gnu | kopensolaris*-gnu) -+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -@@ -4049,7 +4042,7 @@ - ;; - esac - ;; -- linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # KAI C++ Compiler -@@ -4348,7 +4341,7 @@ - _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - -- linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - # old Intel for x86_64 which still supported -KPIC. - ecc*) -@@ -6241,9 +6234,6 @@ - _LT_TAGVAR(ld_shlibs, $1)=yes - ;; - -- gnu*) -- ;; -- - haiku*) - _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_TAGVAR(link_all_deplibs, $1)=yes -@@ -6405,7 +6395,7 @@ - _LT_TAGVAR(inherit_rpath, $1)=yes - ;; - -- linux* | k*bsd*-gnu | kopensolaris*-gnu) -+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*) - case $cc_basename in - KCC*) - # Kuck and Associates, Inc. (KAI) C++ Compiler -diff -ru libgsf-1.14.26.old/missing libgsf-1.14.26/missing ---- libgsf-1.14.26.old/missing 2012-11-14 02:47:40.000000000 +0100 -+++ libgsf-1.14.26/missing 2013-03-03 15:18:34.000000000 +0100 -@@ -1,10 +1,10 @@ - #! /bin/sh - # Common stub for a few missing GNU programs while installing. - --scriptversion=2009-04-28.21; # UTC -+scriptversion=2012-01-06.13; # UTC - - # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, --# 2008, 2009 Free Software Foundation, Inc. -+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. - # Originally by Fran,cois Pinard , 1996. - - # This program is free software; you can redistribute it and/or modify -@@ -84,7 +84,6 @@ - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file -- tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - - Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -@@ -122,15 +121,6 @@ - # Not GNU programs, they don't have --version. - ;; - -- tar*) -- if test -n "$run"; then -- echo 1>&2 "ERROR: \`tar' requires --run" -- exit 1 -- elif test "x$2" = "x--version" || test "x$2" = "x--help"; then -- exit 1 -- fi -- ;; -- - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. -@@ -226,7 +216,7 @@ - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then -- eval LASTARG="\${$#}" -+ eval LASTARG=\${$#} - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` -@@ -256,7 +246,7 @@ - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then -- eval LASTARG="\${$#}" -+ eval LASTARG=\${$#} - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` -@@ -318,41 +308,6 @@ - touch $file - ;; - -- tar*) -- shift -- -- # We have already tried tar in the generic part. -- # Look for gnutar/gtar before invocation to avoid ugly error -- # messages. -- if (gnutar --version > /dev/null 2>&1); then -- gnutar "$@" && exit 0 -- fi -- if (gtar --version > /dev/null 2>&1); then -- gtar "$@" && exit 0 -- fi -- firstarg="$1" -- if shift; then -- case $firstarg in -- *o*) -- firstarg=`echo "$firstarg" | sed s/o//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- case $firstarg in -- *h*) -- firstarg=`echo "$firstarg" | sed s/h//` -- tar "$firstarg" "$@" && exit 0 -- ;; -- esac -- fi -- -- echo 1>&2 "\ --WARNING: I can't seem to be able to run \`tar' with the given arguments. -- You may want to install GNU tar or Free paxutils, or check the -- command line arguments." -- exit 1 -- ;; -- - *) - echo 1>&2 "\ - WARNING: \`$1' is needed, and is $msg. diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 374cd2b..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,7 +0,0 @@ -f7d0442 -df7ab90 -c248f5a -69bb2f0 -afd9445 -1eff4c3 -refresh-config-sub-guess-1.14.26-1 diff --git a/debian/rules b/debian/rules deleted file mode 100755 index a2c64fb..0000000 --- a/debian/rules +++ /dev/null @@ -1,268 +0,0 @@ -#! /usr/bin/make -f -# Based on the sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -include /usr/share/hardening-includes/hardening.make -CFLAGS += $(HARDENING_CFLAGS) -LDFLAGS += $(HARDENING_LDFLAGS) - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -CFLAGS += $(HARDENING_CFLAGS) -LDFLAGS += $(HARDENING_LDFLAGS) - -# Ensure the build aborts when there are still references to undefined -# symbols. -LDFLAGS += -Wl,-z,defs - -# Make the linker work a bit harder so dynamic loading can be done faster -LDFLAGS += -Wl,-O1 - -# Make the linker only include actual dependencies on libraries, rather than -# for all libraries specified in the link line. -LDFLAGS += -Wl,--as-needed - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -upstreamversion=$(shell dpkg-parsechangelog | grep Version | head -1 | sed -e 's/Version: //g' -e 's/-[A-Za-z0-9\.]*$$//g') - -# Only build the runtime packages? Note: be sure to keep this consistent -# with the packages listed in debian/control. -oldlibs_build=0 - -# These values must match their configure.in counterparts -gsf_version_major=1 -gsf_version_minor=14 - -# This goes into the package names; make sure the debian/* files match -so_version_major=$(shell expr $(gsf_version_major) '*' 100 '+' $(gsf_version_minor)) - -# Package names -p_libgsf=libgsf-1-$(so_version_major) -p_libgsf_common=libgsf-1-common -p_libgsf_bin=libgsf-bin -p_libgsf_dev=libgsf-1-dev -p_libgsf_dbg=libgsf-1-$(so_version_major)-dbg -p_libgsf_gir=gir1.2-gsf-1 - -# Build up the options for "./configure" -confflags := -v - -# FHS locations -confflags += --prefix=/usr \ - --sysconfdir=/etc \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info \ - --with-html-dir=\$${prefix}/share/doc/$(p_libgsf_dev)/html - -# Compiler, language dialect -confflags += --enable-compile-warnings=maximum - -# Features -confflags += --with-bz2 --enable-gtk-doc --without-python \ - --with-gio --enable-introspection=yes - -ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) - confflags += --build $(DEB_HOST_GNU_TYPE) -else - confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE) -endif - -DPKG_GENSYMBOLS_CHECK_LEVEL ?= 4 -export DPKG_GENSYMBOLS_CHECK_LEVEL - -.PHONY: source-updates -source-updates: - # Update files/links generated by autotools - env srcdir=`pwd` NOCONFIGURE=1 sh autogen.sh - # Replace links by copies of their targets - for file in `find -type l` ; do \ - tf=`tempfile` && \ - install -p $$file $$tf && \ - rm -f $$file && \ - install -p $$tf $$file && \ - rm -f $$tf ; \ - done - rm -rf autom4te.cache - -.PHONY: configure -configure: config-stamp -config-stamp: - dh_testdir - dh_prep - - rm -rf build && mkdir build - # With current libtool (1.5.24-1), LDFLAGS ends up on the actual - # link line after some "-l" parameters. This is unfortunate, as it - # means that passing "-Wl,--as-needed" through LDFLAGS will not drop - # references to all unneeded libraries. - # - # To work around this, we pass LDFLAGS through CC (which is also - # used for the link rules). The price we pay is some "linker input - # file unused because linking not done" warnings. - cd build && env "CC=$(CC) $(LDFLAGS)" "CFLAGS=$(CFLAGS)" ../configure $(confflags) - - touch config-stamp - -.PHONY: build -build: build-stamp -build-stamp: config-stamp - dh_testdir - cd po; intltool-update -p - - $(MAKE) -C build - - touch build-stamp - -.PHONY: build-arch -build-arch: build-stamp - -.PHONY: build-indep -build-indep: build-stamp - -.PHONY: clean -clean: - dh_testdir - dh_testroot - - if test -d build && test -f build/Makefile ; then \ - $(MAKE) -C build distclean; \ - fi - rm -rf build - - -find -type f -name 'Makefile.am' | sed -e 's/\.am$$//' | xargs rm -f - - # Update config.{sub,guess} from autotools-dev, if possible. - -for f in config.sub config.guess ; do \ - if test -r /usr/share/misc/$$f ; then \ - OLDDATE=`./$$f -t | tr -d -` ; \ - NEWDATE=`/usr/share/misc/$$f -t | tr -d -` ; \ - if [ $$OLDDATE -lt $$NEWDATE ] ; then \ - echo "GNU config automated update of $$f (replacing $$OLDDATE with $$NEWDATE)" 1>&2 ; \ - cp -f /usr/share/misc/$$f $$f ; \ - fi; \ - fi; \ - done - - dh_clean - -.PHONY: install -install: build - dh_testdir - dh_testroot - dh_installdirs - - # Add here commands to install the package into debian/tmp - $(MAKE) -C build \ - GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 \ - DESTDIR=$(CURDIR)/debian/tmp \ - install - - rm -f $(CURDIR)/debian/tmp/usr/lib/libgsf-*.la - - mkdir -p $(CURDIR)/debian/tmp/usr/lib/debug - for l in `find $(CURDIR)/debian/tmp/usr/lib -name '*.so*'`; do \ - cp -vdf $$l $(CURDIR)/debian/tmp/usr/lib/debug ; \ - done - -ifeq ($(oldlibs_build),1) - # Delete files and directories that belong to packages we don't build - cat debian/$(p_libgsf_common).install debian/$(p_libgsf_bin).install debian/$(p_libgsf_dev).install debian/$(p_libgsf_dbg).install | while read pattern ; do \ - (cd debian/tmp && rm -vrf $$pattern) ; \ - done - # Basically all remaining files and directories should belong to a - # package. -else - # Building not just runtime packages. Basically all installed files - # and directories should belong to a package. -endif - - dh_install --sourcedir=debian/tmp --fail-missing -Xindex.sgml - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything that should only affect one package -# should be put in another target (such as the install target) or be put -# into conditional constructs. -.PHONY: binary-common -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs ChangeLog -ifeq ($(DH_OPTIONS),-s) - # The -dbg packages don't have separate documentation; link to the - # corresponding runtime packages' documentation. - rm -rvf $(CURDIR)/debian/$(p_libgsf_dbg)/usr/share/doc/$(p_libgsf_dbg) - - # Unfortunately, "-s" overriding "-p" for dh_link messes things up. - env -u DH_OPTIONS dh_link -p$(p_libgsf_dbg) /usr/share/doc/$(p_libgsf)/ /usr/share/doc/$(p_libgsf_dbg) - # Make the documentation accessible through devhelp. - env -u DH_OPTIONS dh_link -p$(p_libgsf_dev) /usr/share/doc/$(p_libgsf_dev)/html/gsf/ /usr/share/gtk-doc/html/gsf -endif - dh_installdocs -N$(p_libgsf_dbg) - dh_installexamples - dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installcatalogs -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installman -# dh_installcron -# dh_installinfo -# dh_undocumented - dh_gconf -# dh_link - dh_buildinfo - dh_compress -# dh_perl -# dh_python -ifeq ($(DH_OPTIONS),-s) - dh_strip -s -v - - # Unfortunately, "-s" overrides "-p" for dh_makeshlibs and by acting - # on all architecture-dependent packages we would get wrong shlibs - # here, so we need to undo the "-s". - env -u DH_OPTIONS dh_makeshlibs -p$(p_libgsf) -V '$(p_libgsf) (>= $(upstreamversion))' - - dh_shlibdeps -s -l debian/$(p_libgsf)/usr/lib/ -L $(p_libgsf) -endif - dh_girepository -p$(p_libgsf_gir) - dh_fixperms - dh_installdeb - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independent packages using the common target. -.PHONY: binary-indep -binary-indep: build install - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -.PHONY: binary-arch -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common - -## Any other binary targets build just one binary package at a time. -#.PHONY: binary-% -#binary-%: build install -# make -f debian/rules binary-common DH_OPTIONS=-p$* - -.PHONY: binary -binary: binary-indep binary-arch diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index ed2d570..0000000 --- a/debian/watch +++ /dev/null @@ -1,4 +0,0 @@ -version=2 -http://ftp.gnome.org/pub/gnome/sources/libgsf/([\d\.]+)/ \ - libgsf-(.*)\.tar\.xz \ - debian diff --git a/libgsf-1.spec.in b/libgsf-1.spec.in deleted file mode 100644 index 663b776..0000000 --- a/libgsf-1.spec.in +++ /dev/null @@ -1,83 +0,0 @@ -%define name libgsf -%define version @VERSION@ -%define release 1 -%define prefix /usr - -Summary: GNOME Structured File library - -Name: %{name} -Version: %{version} -Release: %{release} -Group: System Environment/Libraries -License: LGPL-2.1-only - -Source: http://ftp.gnome.org/pub/GNOME/sources/libgsf/%{name}-%{version}.tar.gz -Buildroot: /var/tmp/%{name}-%{version}-%{release}-root -URL: http://www.gnumeric.org - -Requires: glib2 >= 2.16.0 -BuildRequires: glib2-devel >= 2.16.0 - -%description -A library for reading and writing structured files (eg MS OLE and Zip) - -%package devel -Summary: Support files necessary to compile applications with libgsf. -Group: Development/Libraries -Requires: libgsf - -%description devel -Libraries, headers, and support files necessary to compile applications using libgsf. - -%prep - -%setup - -%build -%ifarch alpha - MYARCH_FLAGS="--host=alpha-redhat-linux" -%endif - -if [ ! -f configure ]; then -CFLAGS="$RPM_OPT_FLAGS" ./autogen.sh --prefix=%{prefix} -else -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} -fi - -if [ "$SMP" != "" ]; then - (make "MAKE=make -k -j $SMP"; exit 0) - make -else - make -fi - -%install -if [ -d $RPM_BUILD_ROOT ]; then rm -r $RPM_BUILD_ROOT; fi -mkdir -p $RPM_BUILD_ROOT%{prefix} -make prefix=$RPM_BUILD_ROOT%{prefix} install - -%files -%defattr(644,root,root,755) -%doc AUTHORS COPYING README -%{prefix}/lib/lib*.so* - -%files devel -%defattr(644,root,root,755) -%{prefix}/lib/*a -%{prefix}/lib/pkgconfig/libgsf-*1.pc -%{prefix}/include/libgsf-1/* -%{prefix}/share/doc/libgsf/html/* - -%clean -rm -r $RPM_BUILD_ROOT - -%changelog -* Tue May 13 2003 Rui M. Seabra -- fix spec to reflect current stat of the build - -* Tue Jun 18 2002 Rui M. Seabra -- set permission correctly -- fix common mistake of Copyright flag into License flag. - -* Thu May 23 2002 Jody Goldberg -- Initial version -- GitLab From b966b2bb3367ec3b13389ce7523de22f6a4f24b3 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Thu, 12 Sep 2024 02:37:03 +0100 Subject: [PATCH 05/14] build: lookup zlib via pkg-config --- configure.ac | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index 6957bbb..f9c6d4e 100644 --- a/configure.ac +++ b/configure.ac @@ -68,6 +68,7 @@ PKG_CHECK_MODULES(LIBGSF, [ glib-2.0 >= 2.62.0 gio-2.0 >= 2.62.0 libxml-2.0 >= 2.4.16 + zlib >= 1.1.3 ]) AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, [GLIB_VERSION_2_62], [GLib symbol visibility]) @@ -344,45 +345,6 @@ dnl AX_REQUIRE_DEFINED([GTK_DOC_CHECK]) GTK_DOC_CHECK([1.12]) AM_CONDITIONAL(GTK_DOC_INSTALLED, $gtk_doc_installed) -dnl *********************************************************************************** -# Check for zlib. -_cppflags=$CPPFLAGS -_ldflags=$LDFLAGS - -Z_DIR= Z_LIBS= Z_CPPFLAGS= - -AC_ARG_WITH(zlib, - [[ --with-zlib=DIR use libz in DIR]], - [case $withval in - yes|no) ;; - *) Z_DIR=$withval - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" - ;; - esac]) - -if test "x$with_zlib" != xno; then - with_zlib=no - AC_CHECK_HEADER(zlib.h, [AC_CHECK_LIB(z, gzread, [with_zlib=yes])]) -fi -if test "$with_zlib" = no; then - AC_MSG_ERROR([*** zlib is required]) -fi -if test "x$Z_DIR" != "x"; then - Z_CPPFLAGS="-I$Z_DIR/include" - case $host in - *-*-solaris*) Z_LIBS="-L$Z_DIR/lib -R$Z_DIR/lib -lz" ;; - *) Z_LIBS="-L$Z_DIR/lib -lz" ;; - esac -else - Z_LIBS="-lz" -fi -AC_SUBST(Z_CPPFLAGS) -AC_SUBST(Z_LIBS) - -CPPFLAGS=${_cppflags} -LDFLAGS=${_ldflags} - dnl *********************************************************************************** dnl bz2 -- GitLab From 508752c58d0ae01fdbb06b33a4e339e5fd6ab6d0 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 01:46:59 +0100 Subject: [PATCH 06/14] =?UTF-8?q?build:=20drop=20unused=20=E2=80=98version?= =?UTF-8?q?.xml=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also ignore the gsf.actions that gtk-doc pollutes the source tree with --- configure.ac | 1 - doc/.gitignore | 2 +- doc/gsf-docs.xml | 1 - doc/version.xml.in | 1 - 4 files changed, 1 insertion(+), 4 deletions(-) delete mode 100644 doc/version.xml.in diff --git a/configure.ac b/configure.ac index f9c6d4e..f057d5c 100644 --- a/configure.ac +++ b/configure.ac @@ -440,7 +440,6 @@ tools/Makefile thumbnailer/Makefile po/Makefile.in gsf/version.c -doc/version.xml libgsf-1.pc libgsf-win32-1.pc libgsf-zip diff --git a/doc/.gitignore b/doc/.gitignore index 07b51be..f3bad05 100644 --- a/doc/.gitignore +++ b/doc/.gitignore @@ -4,6 +4,7 @@ tmpl html xml gsf.args +gsf.actions gsf.hierarchy gsf.signals gsf-decl.txt @@ -14,7 +15,6 @@ gsf-unused.txt gsf-scan.c gsf.interfaces gsf.prerequisites -version.xml *.stamp *.lo *.o diff --git a/doc/gsf-docs.xml b/doc/gsf-docs.xml index cfcc059..1efc714 100644 --- a/doc/gsf-docs.xml +++ b/doc/gsf-docs.xml @@ -2,7 +2,6 @@ - ]> diff --git a/doc/version.xml.in b/doc/version.xml.in deleted file mode 100644 index af9b9c4..0000000 --- a/doc/version.xml.in +++ /dev/null @@ -1 +0,0 @@ -@GLIB_VERSION@ -- GitLab From 17840ac4ecbf90c11928fffa58424a29e9647c96 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Wed, 4 Sep 2024 03:09:35 +0100 Subject: [PATCH 07/14] docs: remove outdated information I noticed the examples given here all either don't exist anymore, or have stopped using libgsf, cut the introduction down to the summary --- doc/gsf-docs.xml | 158 ++++------------------------------------------- 1 file changed, 11 insertions(+), 147 deletions(-) diff --git a/doc/gsf-docs.xml b/doc/gsf-docs.xml index 1efc714..73083e8 100644 --- a/doc/gsf-docs.xml +++ b/doc/gsf-docs.xml @@ -7,155 +7,19 @@ GSF Reference Manual + + The GNOME Structured File Library (GSF) is an I/O abstraction for reading/writing + compound files. GSF is released under the GNU Lesser General Public License + (GNU LGPL), which allows for flexible licensing of client applications. + GSF was written as part of the Gnumeric project. It started in 2002 as a replacement for + libole2 which Gnumeric was using to handle the Microsoft Excel + file format, as libole2's code had become difficult to maintain and was difficult to + generalize. GSF was designed to be a more general library for dealing with a number of + different types of structured data files and streams. + - - GSF: Introduction - - -The GNOME Structured File Library (GSF) is an I/O abstraction for -reading/writing compound files. GSF is released under the GNU Lesser General Public -License (GNU LGPL), which allows for flexible licensing of client -applications. - - - - - - GSF: History - - -GSF was written as part of the Gnumeric project. It started in 2002 as a -replacement for libole2 which Gnumeric was using to handle the Microsoft -Excel file format, as libole2's -code had become difficult to maintain and was difficult to generalize. GSF -was designed to be a more general library for dealing with a number of -different types of structured data files and streams. - - -With the release of Gnumeric 1.1.6 (July 2002), Gnumeric used GSF and -libole2 was orphaned. - - - - - - GSF: Dependencies - -GSF depends on the following libraries: - - - -GLib - -A general-purpose utility library, not specific to graphical user interfaces. -GLib provides many useful data types, macros, type conversions, -string utilities, file utilities, a main loop abstraction, and so on. - - - - -Libxml2 - -A library that provides a parser and toolkit for XML, the Extensible Markup Language. -XML is a metalanguage used to define markup languages (text languages where -structure and semantics are added to the content using extra "markup" -information). - - - - - -The core GSF library can be built to also utilize the following libraries: - - - -zlib - -A data -compression library that implements the DEFLATE algorithm used in gzip. - - - - -libbz2 - -A data compression library that implements the algorithm used in bzip2. - - - - - -A separate GSF library can be built that offers additional functionality for -use in the GNOME desktop environment. That library has the following -additional requirements: - - - -gio-2.0 - -GIO -is striving to provide a modern, easy-to-use VFS API that sits at the right -level in the library stack. The goal is to overcome the shortcomings of -GnomeVFS and provide an API that is so good that developers prefer it over -raw POSIX calls. Among other things that means using GObject. It also means -not cloning the POSIX API, but providing higher-level, document-centric interfaces. - - - - - - - - - - Projects using GSF - - -GSF is now also being used by other projects than Gnumeric, including - - -KWord - -The word processor application of KOffice, the integrated office suite for -KDE, the K Desktop Environment. - - - - -librsvg - -A library to support the SVG scalable vector graphics -format. - - - - -libwpd - -A library for importing WordPerfect documents. - - - - -planner - -A project management application. - - - - - - - - - API Reference -- GitLab From 17f7ad4199a0a1f4997e8b20ecff8c7698c7d96e Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 02:08:27 +0100 Subject: [PATCH 08/14] python: port to python3 --- python/test-cp-msole.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/python/test-cp-msole.py b/python/test-cp-msole.py index a7e1eec..158e3b1 100755 --- a/python/test-cp-msole.py +++ b/python/test-cp-msole.py @@ -1,11 +1,16 @@ -#!/usr/bin/python +#!/usr/bin/python3 # # test-cp-msole.py # import sys +import gi + +gi.require_version("Gsf", "1") + from gi.repository import Gsf + def clone(iput, oput): size = iput.size if size > 0: @@ -19,6 +24,7 @@ def clone(iput, oput): clone_dir(iput, oput) oput.close() + def clone_dir(iput, oput): nc = iput.num_children() for i in range(nc): @@ -27,27 +33,27 @@ def clone_dir(iput, oput): onew = oput.new_child(iput.name_by_index(i), isdir) clone(inew, onew) + def test(argv): - print "test", argv[1], argv[2] + print(f"test ‘{argv[1]}’ → ‘{argv[2]}’") - input = Gsf.InputStdio.new(argv[1]) - if input == None: - print "yuck1" - infile = Gsf.InfileMSOle.new(input) + input_file = Gsf.InputStdio.new(argv[1]) + if input_file == None: + print("yuck1") + infile = Gsf.InfileMSOle.new(input_file) if infile == None: - print "yuck2" - del input + print("yuck2") + del input_file output = Gsf.OutputStdio.new(argv[2]) if output == None: - print "yuck3" + print("yuck3") outfile = Gsf.OutfileMSOle.new(output) if outfile == None: - print "yuck4" + print("yuck4") del output clone(infile, outfile) - test(sys.argv) -- GitLab From 73eec6c5dbeec9e90b564451fc0bfaed5e858b12 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 02:15:26 +0100 Subject: [PATCH 09/14] build: drop unnecessary checks caddr_t and lstat are unused (and seemingly always available?) timeval and malloc.h are unused Even on Win32 we don't use windres GLib already assumes mode_t and io.h exist, and that fdopen works --- configure.ac | 54 +----------------------------------------- gsf/gsf-output-stdio.c | 2 -- 2 files changed, 1 insertion(+), 55 deletions(-) diff --git a/configure.ac b/configure.ac index f057d5c..0197eea 100644 --- a/configure.ac +++ b/configure.ac @@ -227,58 +227,8 @@ if test "$GCC" = yes -a "x$set_more_warnings" != xno; then fi AC_SUBST(WARN_CFLAGS) -AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no) -if test $fdopen_works = no ; then - unset ac_cv_have_decl_fdopen - CFLAGS="$CFLAGS -D_POSIX_SOURCE" - AC_MSG_NOTICE([adding -D_POSIX_SOURCE to CFLAGS]) - AC_CHECK_DECL(fdopen, fdopen_works=yes, fdopen_works=no) - if test $fdopen_works = no ; then - AC_MSG_ERROR([fdopen is not available]) - fi -fi - -# Unfortunately, -D_POSIX_SOURCE turns off struct timeval on Solaris -AC_MSG_CHECKING([whether struct timeval is available]) -for try in 1 2; do - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[#include ]], - [[struct timeval tv;]])], - struct_timeval_works=yes, - struct_timeval_works=no) - test $struct_timeval_works = yes && break - # Try this for the second attempt: - test $try = 1 && CFLAGS="$CFLAGS -D__EXTENSIONS__" -done -AC_MSG_RESULT($struct_timeval_works) -if test $struct_timeval_works = no ; then - AC_MSG_ERROR([struct timeval is not available]) -fi - AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec]) - -AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for caddr_t]) -AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [[caddr_t ca]])], - need_bsd1=no, - need_bsd1=yes) -AC_MSG_RESULT($need_bsd1) - -AC_MSG_CHECKING([whether -D_BSD_SOURCE is needed for lstat]) -AC_LINK_IFELSE([AC_LANG_PROGRAM( -[[#include -#include -#include ]], -[[void *ptr = &lstat]])], -need_bsd2=no, need_bsd2=yes) -AC_MSG_RESULT($need_bsd2) -if test $need_bsd1 = yes -o $need_bsd2 = yes; then - CFLAGS="$CFLAGS -D_BSD_SOURCE" -fi - -AC_TYPE_MODE_T -AC_CHECK_HEADERS(fcntl.h malloc.h unistd.h io.h sys/statfs.h sys/param.h sys/mount.h utime.h sys/utime.h) +AC_CHECK_HEADERS(fcntl.h unistd.h sys/statfs.h sys/param.h sys/mount.h utime.h sys/utime.h) AC_FUNC_MMAP AC_MSG_CHECKING([form of statfs]) @@ -323,8 +273,6 @@ with_win32=no case $host_os in mingw* | pw32* | cygwin*) with_win32=yes - AC_ARG_VAR(WINDRES, [The windres executable (used by win32 builds only).]) - AC_CHECK_TOOL(WINDRES, windres) AC_ARG_VAR(LIBEXE, [The lib.exe executable (used by win32 builds only).]) AC_CHECK_PROG(LIBEXE, lib.exe, yes, no) ;; diff --git a/gsf/gsf-output-stdio.c b/gsf/gsf-output-stdio.c index 818dcd0..5e565a4 100644 --- a/gsf/gsf-output-stdio.c +++ b/gsf/gsf-output-stdio.c @@ -49,9 +49,7 @@ #include #include #include -#ifdef HAVE_IO_H #include -#endif #endif /* G_OS_WIN32 */ #ifndef W_OK -- GitLab From 4adf2b7405b1d2f584c13ff811eab6ee6f3b3b87 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 03:28:48 +0100 Subject: [PATCH 10/14] build: we can use a macro to check flags --- configure.ac | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index 0197eea..dc2d3ad 100644 --- a/configure.ac +++ b/configure.ac @@ -177,23 +177,7 @@ AC_ARG_WITH([typelib-dir], ) AC_SUBST(TYPELIBDIR) -## this should come after `AC_PROG_CC' -set_more_warnings=yes -if test "$GCC" = yes -a "x$set_more_warnings" != xno; then - dnl Clang needs to option, or else it will appear to support any - dnl warning option - uwoption="-Werror=unknown-warning-option" - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $uwoption" - AC_MSG_CHECKING([whether gcc understands $uwoption]) - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([], [])], - [has_unknown_warning_option=yes], - [has_unknown_warning_option=no; uwoption=""]) - AC_MSG_RESULT($has_unknown_warning_option) - CFLAGS="$SAVE_CFLAGS" - - warning_options="-Wall -Werror=init-self -Werror=missing-include-dirs \ +AX_APPEND_COMPILE_FLAGS([-Wall -Werror=init-self -Werror=missing-include-dirs \ -Wsign-compare -Werror=pointer-arith \ -Wchar-subscripts -Wwrite-strings \ -Wdeclaration-after-statement -Wnested-externs \ @@ -204,28 +188,7 @@ if test "$GCC" = yes -a "x$set_more_warnings" != xno; then -Werror=format-security -Wbitwise -Wcast-to-as \ -Wdefault-bitfield-sign -Wdo-while -Wparen-string \ -Wptr-subtraction-blows -Wreturn-void -Wtypesign \ - -Wstrict-prototypes -Wno-error=format-nonliteral " - for option in $warning_options ; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $uwoption $option" - AC_MSG_CHECKING([whether gcc understands $option]) - dnl Include a system header so we ignore Werror=... flags - dnl that cause trouble. - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [])], - [has_option=yes], - [has_option=no]) - CFLAGS="$SAVE_CFLAGS" - if test $has_option = yes; then - CFLAGS="$CFLAGS $option" - fi - AC_MSG_RESULT($has_option) - unset has_option - unset SAVE_CFLAGS - done - unset option -fi -AC_SUBST(WARN_CFLAGS) + -Wstrict-prototypes -Wno-error=format-nonliteral]) AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec]) AC_CHECK_HEADERS(fcntl.h unistd.h sys/statfs.h sys/param.h sys/mount.h utime.h sys/utime.h) -- GitLab From 268233dbe57a915069385335efd014e040b91401 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 03:30:53 +0100 Subject: [PATCH 11/14] build: use the introspection macro --- Makefile.am | 7 +--- configure.ac | 103 +----------------------------------------------- gsf/Makefile.am | 6 +-- 3 files changed, 5 insertions(+), 111 deletions(-) diff --git a/Makefile.am b/Makefile.am index dc3d99a..d5d66eb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,9 +12,4 @@ SUBDIRS = po gsf gsf-win32 doc tools tests thumbnailer python EXTRA_DIST = BUGS HACKING \ dumpdef.pl -DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc \ - --enable-schemas-install \ - --enable-introspection=auto \ - --with-gir-dir=\$${datadir}/gir-1.0 \ - --with-typelib-dir=\$${libdir}/girepository-1.0 - +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection diff --git a/configure.ac b/configure.ac index dc2d3ad..d6fce4d 100644 --- a/configure.ac +++ b/configure.ac @@ -74,108 +74,7 @@ PKG_CHECK_MODULES(LIBGSF, [ AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, [GLIB_VERSION_2_62], [GLib symbol visibility]) AC_DEFINE(GLIB_VERSION_MAX_ALLOWED, [GLIB_VERSION_2_62], [GLib symbol visibility]) -# GObject Introspection -GIR_REQ=1.0.0 -AC_ARG_ENABLE(introspection, - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], - [Enable introspection for this build]),, - [enable_introspection=no]) - -AC_MSG_CHECKING([for gobject-introspection]) - -dnl presence/version checking -AS_CASE([$enable_introspection], -[no], [ - found_introspection="no (disabled, use --enable-introspection to enable)" -], -[yes],[ - PKG_CHECK_EXISTS([gobject-introspection-1.0],, - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], - found_introspection=yes, - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -], -[auto],[ - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) -dnl Canonicalize enable_introspection -enable_introspection=$found_introspection -], -[ - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -]) - -AC_MSG_RESULT([$found_introspection]) - -if test "x$found_introspection" = "xyes"; then - dnl You can override INTROSPECTION_GIRDIR and INTROSPECTION_TYPELIBDIR - dnl if you wish. If you override the latter, you might want to set - dnl GI_TYPELIB_PATH to include the same directory. For example - dnl - dnl GI_TYPELIB_PATH=$PREFIX/lib64/girepository-1.0 - dnl INTROSPECTION_TYPELIBDIR=$GI_TYPELIB_PATH - dnl INTROSPECTION_GIRDIR=$PREFIX/share/gir-1.0 - dnl - dnl Note, that unlike binaries produced with libgsf, nothing tells - dnl python where to find libgsf, so you might also need to set - dnl LD_LIBRARY_PATH. - - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - if test "x$INTROSPECTION_GIRDIR" = x; then - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - fi - if test "x$INTROSPECTION_TYPELIBDIR" = x; then - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" - fi - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -else - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= - INTROSPECTION_GENERATE= - INTROSPECTION_GIRDIR= - INTROSPECTION_TYPELIBDIR= - INTROSPECTION_CFLAGS= - INTROSPECTION_LIBS= - INTROSPECTION_MAKEFILE= -fi -AC_SUBST(INTROSPECTION_SCANNER) -AC_SUBST(INTROSPECTION_COMPILER) -AC_SUBST(INTROSPECTION_GENERATE) -AC_SUBST(INTROSPECTION_GIRDIR) -AC_SUBST(INTROSPECTION_TYPELIBDIR) -AC_SUBST(INTROSPECTION_CFLAGS) -AC_SUBST(INTROSPECTION_LIBS) -AC_SUBST(INTROSPECTION_MAKEFILE) - -AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -dnl we need to change the install directories for distcheck -AC_ARG_WITH([gir-dir], - AS_HELP_STRING( - [--with-gir-dir], - [ - path to gir repository - (automatically detected via pkg-config) - ] - ), - [GIRDIR=$withval], - [GIRDIR=$INTROSPECTION_GIRDIR] -) -AC_SUBST(GIRDIR) -AC_ARG_WITH([typelib-dir], - AS_HELP_STRING( - [--with-typelib-dir], - [ - path to typelibs repository - (automatically detected via pkg-config) - ] - ), - [TYPELIBDIR=$withval], - [TYPELIBDIR=$INTROSPECTION_TYPELIBDIR] -) -AC_SUBST(TYPELIBDIR) +GOBJECT_INTROSPECTION_CHECK([1.0.0]) AX_APPEND_COMPILE_FLAGS([-Wall -Werror=init-self -Werror=missing-include-dirs \ -Wsign-compare -Werror=pointer-arith \ diff --git a/gsf/Makefile.am b/gsf/Makefile.am index 121015e..9fc3e5a 100644 --- a/gsf/Makefile.am +++ b/gsf/Makefile.am @@ -163,11 +163,11 @@ Gsf_1_gir_LIBS = libgsf-1.la Gsf_1_gir_FILES = $(libgsf_1_include_HEADERS) $(libgsf_1_la_SOURCES) -girdir = $(GIRDIR) +girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) -typelibsdir = $(TYPELIBDIR) -typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) CLEANFILES += $(gir_DATA) $(typelibs_DATA) -- GitLab From d38c52f1d10c7c60bc9f5d3d248bb36d0426d60d Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 14 Sep 2024 03:47:55 +0100 Subject: [PATCH 12/14] build: we only need one copy of dumpdef.pl --- Makefile.am | 2 +- dumpdef.pl | 61 ----------------------------------------------------- gsf.mk | 4 ++-- 3 files changed, 3 insertions(+), 64 deletions(-) delete mode 100755 dumpdef.pl diff --git a/Makefile.am b/Makefile.am index d5d66eb..4bbaeb9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,6 +10,6 @@ endif SUBDIRS = po gsf gsf-win32 doc tools tests thumbnailer python EXTRA_DIST = BUGS HACKING \ - dumpdef.pl + msvc/dumpdef.pl DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection diff --git a/dumpdef.pl b/dumpdef.pl deleted file mode 100755 index cf38bd5..0000000 --- a/dumpdef.pl +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/perl -w -# -# dumpdef.pl: Extract function declarations from C headers. -# -# Copyright (C) 2005 Ivan, Wong Yat Cheung -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of version 2.1 of the GNU Lesser General Public -# License as published by the Free Software Foundation. -# -# This program 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 program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA -# USA -# - -sub parse_header { - my ($lines, $file, @symbols); - - $file = shift; - open HEADER, $file or die "Cannot open $file: $!\n"; - $/ = undef; - $lines =
; - close HEADER; - while ($lines =~ /^\s*[A-Za-z_]\w*(?:\s+[A-Za-z_]\w*)*[\s\*]+ #function type - ([A-Za-z_]\w*)\s*\( #function name - (?:\s*[A-Za-z_]\w*(?:[\s\*]+[A-Za-z_]\w*)*[\s\*]+[A-Za-z_]\w*(?:\s*\[\s*\]\s*)? #[first arg - (?:\s*,\s*[A-Za-z_]\w*(?:[\s\*]+[A-Za-z_]\w*)*[\s\*]+[A-Za-z_]\w*(?:\s*\[\s*\]\s*)?)* #[more args]] - (?:\s*,\s*\.{3})?|void) #vargs or void - \s*\)\s* #close - (?:(?:G_GNUC_PRINTF|G_GNUC_SCANF)\s*\(\s*\d+\s*,\s*\d+\) # predefined macro modifiers] - |G_GNUC_FORMAT\s*\(\s*\d+\s*\) - |G_GNUC_NORETURN|G_GNUC_CONST|G_GNUC_UNUSED|G_GNUC_NO_INSTRUMENT - |G_GNUC_DEPRECATED)? - \s*;/gxm) { - push @symbols, $1; - } - while ($lines =~ /^\s*extern\s+ #function type - [A-Za-z_]\w*(?:[\s\*]+[A-Za-z_]\w*)*[\s\*]+([A-Za-z_]\w*) #[first arg - \s*(?:\[\s*\]\s*)?;/gxm) { - push @symbols, "$1 DATA"; - } - @symbols; -} - -die "Usage: dumpdef.pl files...\n" if ($#ARGV == -1); - -my @symbols; -do { - push @symbols, parse_header $ARGV[0]; - shift @ARGV; -} while ($#ARGV != -1); - -print join "\n", sort @symbols; -print "\n"; - diff --git a/gsf.mk b/gsf.mk index 2ee2a7a..2173dfb 100644 --- a/gsf.mk +++ b/gsf.mk @@ -6,7 +6,7 @@ noinst_DATA = lib.def lib.def: stamp-lib.def @true -stamp-lib.def: $(LIB_PUBLIC_HDRS) Makefile $(top_srcdir)/dumpdef.pl +stamp-lib.def: $(LIB_PUBLIC_HDRS) Makefile $(top_srcdir)/msvc/dumpdef.pl hdrs='$(LIB_PUBLIC_HDRS)'; \ hdrs_list=''; \ for hdr in $$hdrs; do \ @@ -20,7 +20,7 @@ stamp-lib.def: $(LIB_PUBLIC_HDRS) Makefile $(top_srcdir)/dumpdef.pl sed -e 's/^#[ \t]*include[ \t]\+.*$$//g' | \ $(CPP) $(AM_CPPFLAGS) $(CPP_CFLAGS) -P - > xgen-libdef.1 && \ echo EXPORTS> xgen-libdef.2 && \ - perl $(top_srcdir)/dumpdef.pl \ + perl $(top_srcdir)/msvc/dumpdef.pl \ xgen-libdef.1 >> xgen-libdef.2 \ && (cmp -s xgen-libdef.2 lib.def || \ cp xgen-libdef.2 lib.def) \ -- GitLab From e438168a784f819f375ed2bbd589528ae1ba6586 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 7 Sep 2024 04:15:25 +0100 Subject: [PATCH 13/14] GsfOutput: Avoid UB in calculation We should check the value is in range ahead of time, instead of retrospectively attempting to catch an overflow --- gsf/gsf-fwd.h | 1 + gsf/gsf-output.c | 14 +++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gsf/gsf-fwd.h b/gsf/gsf-fwd.h index 817a09e..07ed547 100644 --- a/gsf/gsf-fwd.h +++ b/gsf/gsf-fwd.h @@ -99,6 +99,7 @@ typedef gint64 gsf_off_t; * #gsf_off_t. */ #define GSF_OFF_T_FORMAT G_GINT64_FORMAT +#define GSF_OFF_T_MAX G_MAXINT64 typedef struct _GsfXMLIn GsfXMLIn; typedef struct _GsfXMLInDoc GsfXMLInDoc; diff --git a/gsf/gsf-output.c b/gsf/gsf-output.c index d72e006..0aae457 100644 --- a/gsf/gsf-output.c +++ b/gsf/gsf-output.c @@ -411,17 +411,25 @@ gsf_output_seek (GsfOutput *output, gsf_off_t offset, GSeekType whence) return FALSE; } + static inline gboolean gsf_output_inc_cur_offset (GsfOutput *output, gsf_off_t num_bytes) { - output->cur_offset += num_bytes; - if (output->cur_offset < num_bytes) + if (G_UNLIKELY (num_bytes < 0 || + (GSF_OFF_T_MAX - num_bytes) < output->cur_offset)) { return gsf_output_set_error (output, 0, "Output size overflow."); - if (output->cur_size < output->cur_offset) + } + + output->cur_offset += num_bytes; + + if (output->cur_size < output->cur_offset) { output->cur_size = output->cur_offset; + } + return TRUE; } + /** * gsf_output_write: (virtual Write) * @output: Output stream -- GitLab From 6e977279d355a5dbc49eba375c287f1490341162 Mon Sep 17 00:00:00 2001 From: Zander Brown Date: Sat, 7 Sep 2024 06:37:25 +0100 Subject: [PATCH 14/14] GsfOutputMemory: Take care when expanding the buffer Avoid overflows when calculating the needed space, and overallocate using the same rules as GString --- gsf/gsf-output-memory.c | 76 +++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 26 deletions(-) diff --git a/gsf/gsf-output-memory.c b/gsf/gsf-output-memory.c index 6ea9c13..4ce74f2 100644 --- a/gsf/gsf-output-memory.c +++ b/gsf/gsf-output-memory.c @@ -25,7 +25,6 @@ #include #define MIN_BLOCK 512 -#define MAX_STEP (MIN_BLOCK * 128) static GsfOutputClass *parent_class; @@ -77,35 +76,57 @@ gsf_output_memory_seek (G_GNUC_UNUSED GsfOutput *output, return TRUE; } -static gboolean -gsf_output_memory_expand (GsfOutputMemory *mem, gsf_off_t needed) + +/* Taken from gutilsprivate.h: + * Returns the smallest power of 2 greater than or equal to n, + * or 0 if such power does not fit in a gsize + */ +static inline gsize +g_nearest_pow (gsize num) +{ + gsize n = num - 1; + + g_assert (num > 0 && num <= G_MAXSIZE / 2); + + n |= n >> 1; + n |= n >> 2; + n |= n >> 4; + n |= n >> 8; + n |= n >> 16; +#if GLIB_SIZEOF_SIZE_T == 8 + n |= n >> 32; +#endif + + return n + 1; +} + + +/* Returns false in the event of overflow */ +static inline gboolean +maybe_expand (GsfOutputMemory *mem, size_t offset, size_t requested) { - gsf_off_t capacity = MAX (mem->capacity, MIN_BLOCK); - gsize lcapacity; - - /* If we need >= MAX_STEP, align to a next multiple of MAX_STEP. - * Since MAX_STEP is probably a power of two, this computation - * should reduce to "dec, shr, inc, shl", which is probably - * quicker then branching. - */ - if (needed < MAX_STEP) - while (capacity < needed) - capacity *= 2; - else - capacity = ((needed - 1) / MAX_STEP + 1) * MAX_STEP; - - /* Check for overflow: g_renew() casts its parameters to gsize. */ - lcapacity = capacity; - if ((gsf_off_t) lcapacity != capacity || capacity < 0) { - g_warning ("overflow in gsf_output_memory_expand"); + size_t needed, new_capacity; + + if (G_UNLIKELY (!g_size_checked_add (&needed, offset, requested))) { return FALSE; } - mem->buffer = g_renew (guint8, mem->buffer, lcapacity); - mem->capacity = capacity; + + if (needed < mem->capacity) { + /* We've already allocated enough, nothing more to do */ + return TRUE; + } + + new_capacity = g_nearest_pow (MAX (needed, MIN_BLOCK)); + /* if we can't over-allocate, allocate exactly */ + new_capacity = G_LIKELY (new_capacity > 0) ? new_capacity : needed; + + mem->buffer = g_renew (guint8, mem->buffer, new_capacity); + mem->capacity = new_capacity; return TRUE; } + static gboolean gsf_output_memory_write (GsfOutput *output, size_t num_bytes, @@ -119,9 +140,12 @@ gsf_output_memory_write (GsfOutput *output, mem->buffer = g_new (guint8, MIN_BLOCK); mem->capacity = MIN_BLOCK; } - if (num_bytes + output->cur_offset > mem->capacity) { - if (!gsf_output_memory_expand (mem, output->cur_offset + num_bytes)) - return FALSE; + + /* We can't allocate more than MAXSIZE bytes, so the offset will always + * be within size_t's range */ + if (!maybe_expand (mem, (size_t) output->cur_offset, num_bytes)) { + g_warning ("overflow in gsf_output_memory_write"); + return FALSE; } memcpy (mem->buffer + output->cur_offset, buffer, num_bytes); -- GitLab