From 2ead7659baa8d1513a67249e1a35176036b40c5c7f775df7c9f392744f94035e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 4 Jan 2013 14:33:56 +0000 Subject: [PATCH] Accepting request 146710 from home:elvigia:branches:devel:libraries:c_c++ - Version 5.0.3 * The library is now purely reentrant and thread-safe * Adds an EGifSetGifVersion() entry point * All names of exported functions now have a Gif, DGif, or EGif prefix. - packaging changes: * soname is now libgif6 * Compatibility with ancient "libungif" via rpm spec file hacks is no longer included, if there is any application around that still requires this it has to be fixed. OBS-URL: https://build.opensuse.org/request/show/146710 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/giflib?expand=0&rev=17 --- giflib-4.1.6.tar.bz2 | 3 --- giflib-5.0.3.tar.bz2 | 3 +++ giflib-visibility.patch | 59 ++++++++++------------------------------- giflib.changes | 14 ++++++++++ giflib.spec | 16 +++-------- 5 files changed, 34 insertions(+), 61 deletions(-) delete mode 100644 giflib-4.1.6.tar.bz2 create mode 100644 giflib-5.0.3.tar.bz2 diff --git a/giflib-4.1.6.tar.bz2 b/giflib-4.1.6.tar.bz2 deleted file mode 100644 index 4851a3a..0000000 --- a/giflib-4.1.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e1c1ced9c5bc8f93ef0faf0a8c7717abf784d10a7b270d2285e8e1f3b93f2bed -size 506050 diff --git a/giflib-5.0.3.tar.bz2 b/giflib-5.0.3.tar.bz2 new file mode 100644 index 0000000..23cd327 --- /dev/null +++ b/giflib-5.0.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5642cc7ce79c5c4e4e37441d718f8dd11b7e12dd213ed5e3c872211a1d3f5f81 +size 629169 diff --git a/giflib-visibility.patch b/giflib-visibility.patch index 6bdd494..d3f3b85 100644 --- a/giflib-visibility.patch +++ b/giflib-visibility.patch @@ -1,6 +1,6 @@ --- lib/gif_lib_private.h.orig +++ lib/gif_lib_private.h -@@ -30,6 +30,8 @@ +@@ -29,6 +29,8 @@ gif_lib_private.h - internal giflib rout #define IS_READABLE(Private) (Private->FileState & FILE_STATE_READ) #define IS_WRITEABLE(Private) (Private->FileState & FILE_STATE_WRITE) @@ -9,60 +9,39 @@ typedef struct GifFilePrivateType { GifWord FileState, FileHandle, /* Where all this data goes to! */ BitsPerPixel, /* Bits per pixel (Codes uses at least this + 1). */ -@@ -55,5 +57,5 @@ typedef struct GifFilePrivateType { +@@ -54,6 +56,7 @@ typedef struct GifFilePrivateType { + bool gif89; } GifFilePrivateType; - extern int _GifError; -- +#pragma GCC visibility pop #endif /* _GIF_LIB_PRIVATE_H */ ---- lib/getarg.h.orig -+++ lib/getarg.h -@@ -16,6 +16,8 @@ - #define CMD_ERR_NumRead 4 /* Failed on reading number. */ - #define CMD_ERR_AllSatis 5 /* Fail to satisfy (must-'!') option. */ -+#pragma GCC visibility push(hidden) -+ - #ifdef HAVE_STDARG_H - int GAGetArgs(int argc, char **argv, char *CtrlStr, ...); - #elif defined (HAVE_VARARGS_H) -@@ -25,4 +27,5 @@ int GAGetArgs(int va_alist, ...); - void GAPrintErrMsg(int Error); - void GAPrintHowTo(char *CtrlStr); - -+#pragma GCC visibility pop - #endif /* _GETARG_H */ + /* end */ --- lib/gif_hash.h.orig +++ lib/gif_hash.h -@@ -47,6 +47,8 @@ +@@ -25,6 +25,8 @@ gif_hash.h - magfic constants and declar #define HT_PUT_KEY(l) (l << 12) #define HT_PUT_CODE(l) (l & 0x0FFF) +#pragma GCC visibility push(hidden) + typedef struct GifHashTableType { - UINT32 HTable[HT_SIZE]; + uint32_t HTable[HT_SIZE]; } GifHashTableType; -@@ -56,4 +58,6 @@ void _ClearHashTable(GifHashTableType *H - void _InsertHashTable(GifHashTableType *HashTable, UINT32 Key, int Code); - int _ExistsHashTable(GifHashTableType *HashTable, UINT32 Key); +@@ -34,6 +36,8 @@ void _ClearHashTable(GifHashTableType *H + void _InsertHashTable(GifHashTableType *HashTable, uint32_t Key, int Code); + int _ExistsHashTable(GifHashTableType *HashTable, uint32_t Key); +#pragma GCC visibility pop + #endif /* _GIF_HASH_H_ */ ---- Makefile.am.orig -+++ Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = lib util doc pic - WINDOWS = $(top_srcdir)/windows/GifWin.cpp \ - $(top_srcdir)/windows/GifWin.h \ + + /* end */ --- configure.ac.orig +++ configure.ac -@@ -3,11 +3,14 @@ AC_INIT(giflib, [4.1.6], [abadger1999@so - AC_CONFIG_SRCDIR([lib/dgif_lib.c]) - AM_INIT_AUTOMAKE([gnu check-news dist-bzip2 -Wall]) +@@ -8,11 +8,14 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_R + dnl Note: config.h is not used in the current build + dnl We leave this in place only to suppress an error message at autogen time AM_CONFIG_HEADER(config.h) +AC_CONFIG_MACRO_DIR([m4]) @@ -77,13 +56,3 @@ AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET ---- lib/Makefile.am.orig -+++ lib/Makefile.am -@@ -21,6 +21,6 @@ libgif_la_SOURCES = dev2gif.c \ - quantize.c \ - gif_lib_private.h - --libgif_la_LDFLAGS = -version-info 5:6:1 -+libgif_la_LDFLAGS = -no-undefined -version-info 5:6:1 - libgif_la_LIBADD = @DEVS@ - libgif_CFLAGS = $(X_CFLAGS) $(AM_CFLAGS) diff --git a/giflib.changes b/giflib.changes index 8d9df5b..da2c044 100644 --- a/giflib.changes +++ b/giflib.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sun Dec 30 22:31:28 UTC 2012 - crrodriguez@opensuse.org + +- Version 5.0.3 +* The library is now purely reentrant and thread-safe +* Adds an EGifSetGifVersion() entry point +* All names of exported functions now have a Gif, DGif, or EGif prefix. + +- packaging changes: +* soname is now libgif6 +* Compatibility with ancient "libungif" via rpm spec file hacks + is no longer included, if there is any application around + that still requires this it has to be fixed. + ------------------------------------------------------------------- Sun Feb 5 16:23:36 UTC 2012 - jengelh@medozas.de diff --git a/giflib.spec b/giflib.spec index 5bd2a0a..edf8757 100644 --- a/giflib.spec +++ b/giflib.spec @@ -17,7 +17,7 @@ Name: giflib -%define lname libgif4 +%define lname libgif6 BuildRequires: libtool BuildRequires: xorg-x11-libICE-devel BuildRequires: xorg-x11-libSM-devel @@ -26,7 +26,7 @@ BuildRequires: xorg-x11-libXau-devel BuildRequires: xorg-x11-libXdmcp-devel BuildRequires: xorg-x11-libXt-devel Url: http://sourceforge.net/projects/giflib -Version: 4.1.6 +Version: 5.0.3 Release: 0 Summary: A Library for Working with GIF Images License: MIT @@ -52,11 +52,6 @@ Obsoletes: libungif-64bit %endif # Provides: libungif -%ifarch ia64 x86_64 s390x ppc64 -Provides: libungif.so.4()(64bit) -%else -Provides: libungif.so.4 -%endif Obsoletes: libungif %description -n %lname @@ -103,18 +98,13 @@ done mkdir m4;autoreconf -fiv %configure --disable-static --with-pic --x-libraries=%{_libdir} -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %install make install DESTDIR=$RPM_BUILD_ROOT -chmod 755 $RPM_BUILD_ROOT/%{_libdir}/lib*.so.* -ln -sf libgif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.%{version} -ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so.4 -ln -sf libungif.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libungif.so #ln -sf libgif.a $RPM_BUILD_ROOT%{_libdir}/libungif.a rm -f %{buildroot}%{_libdir}/*.la find doc -name "Makefile*" -print -delete -nm -C -D %{buildroot}%{_libdir}/lib*.so %post -n %lname -p /sbin/ldconfig