[tkimg: 1/2] - Unbundled zlib and libjpeg

Sergio Pascual sergiopr at fedoraproject.org
Sun Feb 20 08:53:54 UTC 2011 

commit cb444b63cbd4eb68743381513b2f235adc11f5ce
Author: Sergio Pascual <sergiopr at fis.ucm.es>
Date:   Thu Dec 16 16:46:59 2010 +0100

    - Unbundled zlib and libjpeg

 tkimg-20081115-syslibs-jpg.patch  |   41 -------
 tkimg-20081115-syslibs-zlib.patch |   56 ----------
 tkimg-jpg.patch                   |   61 +++++++++++
 tkimg-zlib.patch                  |  214 +++++++++++++++++++++++++++++++++++++
 tkimg.spec                        |   21 +++-
 5 files changed, 291 insertions(+), 102 deletions(-)
---
diff --git a/tkimg-jpg.patch b/tkimg-jpg.patch
new file mode 100644
index 0000000..c92ca92
--- /dev/null
+++ b/tkimg-jpg.patch
@@ -0,0 +1,61 @@
+diff -ur tkimg1.4/libjpeg/configure tkimg1.4.jpg/libjpeg/configure
+--- tkimg1.4/libjpeg/configure	2010-07-07 10:09:46.000000000 +0200
++++ tkimg1.4.jpg/libjpeg/configure	2010-12-16 15:57:33.642585100 +0100
+@@ -5044,22 +5044,6 @@
+ 
+ 
+     vars="
+-	../compat/libjpeg/jcapimin.c	../compat/libjpeg/jcapistd.c	../compat/libjpeg/jccoefct.c
+-	../compat/libjpeg/jccolor.c	../compat/libjpeg/jcdctmgr.c	../compat/libjpeg/jchuff.c
+-	../compat/libjpeg/jcinit.c	../compat/libjpeg/jcmainct.c	../compat/libjpeg/jcmarker.c
+-	../compat/libjpeg/jcmaster.c	../compat/libjpeg/jcomapi.c	../compat/libjpeg/jcparam.c
+-	../compat/libjpeg/jcarith.c	../compat/libjpeg/jcprepct.c	../compat/libjpeg/jcsample.c
+-	../compat/libjpeg/jctrans.c	../compat/libjpeg/jdapimin.c	../compat/libjpeg/jdapistd.c
+-	../compat/libjpeg/jdatadst.c	../compat/libjpeg/jdatasrc.c	../compat/libjpeg/jdcoefct.c
+-	../compat/libjpeg/jdcolor.c	../compat/libjpeg/jddctmgr.c	../compat/libjpeg/jdhuff.c
+-	../compat/libjpeg/jdinput.c	../compat/libjpeg/jdmainct.c	../compat/libjpeg/jdmarker.c
+-	../compat/libjpeg/jdmaster.c	../compat/libjpeg/jdmerge.c	../compat/libjpeg/jdarith.c
+-	../compat/libjpeg/jdpostct.c	../compat/libjpeg/jdsample.c	../compat/libjpeg/jdtrans.c
+-	../compat/libjpeg/jerror.c	../compat/libjpeg/jfdctflt.c	../compat/libjpeg/jfdctfst.c
+-	../compat/libjpeg/jfdctint.c	../compat/libjpeg/jidctflt.c	../compat/libjpeg/jidctfst.c
+-	../compat/libjpeg/jidctint.c	../compat/libjpeg/jaricom.c	../compat/libjpeg/jquant1.c
+-	../compat/libjpeg/jquant2.c	../compat/libjpeg/jutils.c	../compat/libjpeg/jmemmgr.c
+-	../compat/libjpeg/jmemansi.c
+ "
+     for i in $vars; do
+ 	case $i in
+@@ -5860,7 +5844,7 @@
+     if test $tcl_cv_cc_visibility_hidden = yes; then :
+ 
+ 
+-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
++$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
+ 
+ 
+ fi
+diff -ur tkimg1.4/libjpeg/jpegtclDecls.h tkimg1.4.jpg/libjpeg/jpegtclDecls.h
+--- tkimg1.4/libjpeg/jpegtclDecls.h	2010-07-07 13:08:08.000000000 +0200
++++ tkimg1.4.jpg/libjpeg/jpegtclDecls.h	2010-12-16 15:56:16.672987765 +0100
+@@ -30,8 +30,8 @@
+ 
+ /* undef Tcl macros that conflict with libjpeg stuff (sigh) */
+ #undef EXTERN
+-#include "../compat/libjpeg/jpeglib.h"
+-#include "../compat/libjpeg/jerror.h"
++#include </usr/include/jpeglib.h>
++#include </usr/include/jerror.h>
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
+diff -ur tkimg1.4/libjpeg/Makefile.in tkimg1.4.jpg/libjpeg/Makefile.in
+--- tkimg1.4/libjpeg/Makefile.in	2010-07-07 13:08:08.000000000 +0200
++++ tkimg1.4.jpg/libjpeg/Makefile.in	2010-12-16 15:58:34.049990255 +0100
+@@ -107,7 +107,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -ljpeg
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
diff --git a/tkimg-zlib.patch b/tkimg-zlib.patch
new file mode 100644
index 0000000..5ab8973
--- /dev/null
+++ b/tkimg-zlib.patch
@@ -0,0 +1,214 @@
+diff -ur tkimg1.4/zlib/configure tkimg1.4.zlib/zlib/configure
+--- tkimg1.4/zlib/configure	2010-07-13 17:44:38.000000000 +0200
++++ tkimg1.4.zlib/zlib/configure	2010-12-16 15:39:59.897642284 +0100
+@@ -5040,177 +5040,6 @@
+ 
+ 
+ 
+-    vars="../compat/zlib/adler32.c	../compat/zlib/compress.c	../compat/zlib/crc32.c"
+-    for i in $vars; do
+-	case $i in
+-	    \$*)
+-		# allow $-var names
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		PKG_OBJECTS="$PKG_OBJECTS $i"
+-		;;
+-	    *)
+-		# check for existence - allows for generic/win/unix VPATH
+-		# To add more dirs here (like 'src'), you have to update VPATH
+-		# in Makefile.in as well
+-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+-		    ; then
+-		    as_fn_error "could not find source file '$i'" "$LINENO" 5
+-		fi
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		# this assumes it is in a VPATH dir
+-		i=`basename $i`
+-		# handle user calling this before or after TEA_SETUP_COMPILER
+-		if test x"${OBJEXT}" != x ; then
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
+-		else
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
+-		fi
+-		PKG_OBJECTS="$PKG_OBJECTS $j"
+-		;;
+-	esac
+-    done
+-
+-
+-
+-
+-    vars="../compat/zlib/deflate.c	../compat/zlib/gzclose.c	../compat/zlib/gzlib.c"
+-    for i in $vars; do
+-	case $i in
+-	    \$*)
+-		# allow $-var names
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		PKG_OBJECTS="$PKG_OBJECTS $i"
+-		;;
+-	    *)
+-		# check for existence - allows for generic/win/unix VPATH
+-		# To add more dirs here (like 'src'), you have to update VPATH
+-		# in Makefile.in as well
+-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+-		    ; then
+-		    as_fn_error "could not find source file '$i'" "$LINENO" 5
+-		fi
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		# this assumes it is in a VPATH dir
+-		i=`basename $i`
+-		# handle user calling this before or after TEA_SETUP_COMPILER
+-		if test x"${OBJEXT}" != x ; then
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
+-		else
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
+-		fi
+-		PKG_OBJECTS="$PKG_OBJECTS $j"
+-		;;
+-	esac
+-    done
+-
+-
+-
+-
+-    vars="../compat/zlib/gzread.c	../compat/zlib/gzwrite.c	../compat/zlib/infback.c"
+-    for i in $vars; do
+-	case $i in
+-	    \$*)
+-		# allow $-var names
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		PKG_OBJECTS="$PKG_OBJECTS $i"
+-		;;
+-	    *)
+-		# check for existence - allows for generic/win/unix VPATH
+-		# To add more dirs here (like 'src'), you have to update VPATH
+-		# in Makefile.in as well
+-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+-		    ; then
+-		    as_fn_error "could not find source file '$i'" "$LINENO" 5
+-		fi
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		# this assumes it is in a VPATH dir
+-		i=`basename $i`
+-		# handle user calling this before or after TEA_SETUP_COMPILER
+-		if test x"${OBJEXT}" != x ; then
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
+-		else
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
+-		fi
+-		PKG_OBJECTS="$PKG_OBJECTS $j"
+-		;;
+-	esac
+-    done
+-
+-
+-
+-
+-    vars="../compat/zlib/inffast.c	../compat/zlib/inflate.c	../compat/zlib/inftrees.c"
+-    for i in $vars; do
+-	case $i in
+-	    \$*)
+-		# allow $-var names
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		PKG_OBJECTS="$PKG_OBJECTS $i"
+-		;;
+-	    *)
+-		# check for existence - allows for generic/win/unix VPATH
+-		# To add more dirs here (like 'src'), you have to update VPATH
+-		# in Makefile.in as well
+-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+-		    ; then
+-		    as_fn_error "could not find source file '$i'" "$LINENO" 5
+-		fi
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		# this assumes it is in a VPATH dir
+-		i=`basename $i`
+-		# handle user calling this before or after TEA_SETUP_COMPILER
+-		if test x"${OBJEXT}" != x ; then
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
+-		else
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
+-		fi
+-		PKG_OBJECTS="$PKG_OBJECTS $j"
+-		;;
+-	esac
+-    done
+-
+-
+-
+-
+-    vars="../compat/zlib/trees.c	../compat/zlib/uncompr.c	../compat/zlib/zutil.c"
+-    for i in $vars; do
+-	case $i in
+-	    \$*)
+-		# allow $-var names
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		PKG_OBJECTS="$PKG_OBJECTS $i"
+-		;;
+-	    *)
+-		# check for existence - allows for generic/win/unix VPATH
+-		# To add more dirs here (like 'src'), you have to update VPATH
+-		# in Makefile.in as well
+-		if test ! -f "${srcdir}/$i" -a ! -f "${srcdir}/generic/$i" \
+-		    -a ! -f "${srcdir}/win/$i" -a ! -f "${srcdir}/unix/$i" \
+-		    ; then
+-		    as_fn_error "could not find source file '$i'" "$LINENO" 5
+-		fi
+-		PKG_SOURCES="$PKG_SOURCES $i"
+-		# this assumes it is in a VPATH dir
+-		i=`basename $i`
+-		# handle user calling this before or after TEA_SETUP_COMPILER
+-		if test x"${OBJEXT}" != x ; then
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.${OBJEXT}"
+-		else
+-		    j="`echo $i | sed -e 's/\.[^.]*$//'`.\${OBJEXT}"
+-		fi
+-		PKG_OBJECTS="$PKG_OBJECTS $j"
+-		;;
+-	esac
+-    done
+-
+-
+-
+-
+-
+     vars="zlibtcl.h zlibtclDecls.h"
+     for i in $vars; do
+ 	# check for existence, be strict because it is installed
+@@ -5970,7 +5799,7 @@
+     if test $tcl_cv_cc_visibility_hidden = yes; then :
+ 
+ 
+-$as_echo "#define MODULE_SCOPE extern __attribute__((__visibility__(\"hidden\")))" >>confdefs.h
++$as_echo "#define MODULE_SCOPE extern" >>confdefs.h
+ 
+ 
+ fi
+diff -ur tkimg1.4/zlib/Makefile.in tkimg1.4.zlib/zlib/Makefile.in
+--- tkimg1.4/zlib/Makefile.in	2010-06-04 15:33:04.000000000 +0200
++++ tkimg1.4.zlib/zlib/Makefile.in	2010-12-16 15:34:33.622273422 +0100
+@@ -107,7 +107,7 @@
+ RANLIB_STUB	= @RANLIB_STUB@
+ SHLIB_CFLAGS	= @SHLIB_CFLAGS@
+ SHLIB_LD	= @SHLIB_LD@
+-SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@
++SHLIB_LD_LIBS	= @SHLIB_LD_LIBS@ -lz
+ STLIB_LD	= @STLIB_LD@
+ TCL_DEFS	= @TCL_DEFS@
+ TCL_BIN_DIR	= @TCL_BIN_DIR@
+diff -ur tkimg1.4/zlib/zlibtclDecls.h tkimg1.4.zlib/zlib/zlibtclDecls.h
+--- tkimg1.4/zlib/zlibtclDecls.h	2010-07-07 13:08:08.000000000 +0200
++++ tkimg1.4.zlib/zlib/zlibtclDecls.h	2010-12-16 15:26:33.858679982 +0100
+@@ -28,7 +28,7 @@
+ EXTERN int Zlibtcl_Init(Tcl_Interp *interp);
+ EXTERN int Zlibtcl_SafeInit(Tcl_Interp *interp);
+ 
+-#include "../compat/zlib/zlib.h"
++#include "/usr/include/zlib.h"
+ 
+ /* !BEGIN!: Do not edit below this line. */
+ 
diff --git a/tkimg.spec b/tkimg.spec
index 3268e11..b2d0e8f 100644
--- a/tkimg.spec
+++ b/tkimg.spec
@@ -3,19 +3,22 @@
 
 Name: tkimg
 Version: 1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: More Image Formats for Tk
 
 Group: Development/Libraries
 License: BSD
 URL: http://sourceforge.net/projects/tkimg
 Source0: https://downloads.sourceforge.net/project/tkimg/tkimg/1.4/tkimg1.4.tar.bz2
+Patch0: tkimg-zlib.patch
+Patch1: tkimg-jpg.patch
 
 Buildroot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 # A request to allow building with system libraries has been submitted
 # https://sourceforge.net/tracker/index.php?func=detail&aid=2292032&group_id=52039&atid=465495
 BuildRequires: tcl-devel tk-devel tcllib
+BuildRequires: zlib-devel libjpeg-devel
 #BuildRequires: libtiff-devel libpng-devel libjpeg-devel zlib-devel libXft-devel
 
 Requires: tcl(abi) = 8.5
@@ -31,12 +34,17 @@ Summary: Libraries, includes, etc. used to develop an application with %{name}
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: tcl-devel tk-devel
-Requires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel
+#Requires: libtiff-devel libpng-devel libjpeg-devel zlib-devel
 %description devel
 These are the header files needed to develop a %{name} application
 
 %prep
 %setup -q -n %{name}%{version}
+%patch0 -p1
+rm -rf compat/zlib
+%patch1 -p1
+rm -rf compat/libjpeg
 
 %build
 %configure --with-tcl=%{tcl_sitearch} --with-tk=%{_libdir} --libdir=%{tcl_sitearch} --disable-threads --enable-64bit
@@ -83,13 +91,16 @@ rm -rf %{buildroot}
 %{tcl_sitearch}/Img1.4/*.a
 
 %changelog
-* Mon Dec 13 2010 Sergio Pascual <sergiopr at fedoraproject.org> - tkimg-1.4-1
+* Thu Dec 16 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-2
+- Unbundled zlib and libjpeg
+
+* Mon Dec 13 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-1
 - Upstream releases 1.4
 
-* Thu Oct 07 2010 Sergio Pascual <sergiopr at fedoraproject.org> - tkimg-1.4-0.9.20100906svn
+* Thu Oct 07 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.9.20100906svn
 - EVR bump. Upload source tarball
 
-* Thu Oct 07 2010 Sergio Pascual <sergiopr at fedoraproject.org> - tkimg-1.4-0.8.20100906svn
+* Thu Oct 07 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.8.20100906svn
 - New upstream source
 
 * Sat Feb 06 2010 Sergio Pascual <sergiopr at fedoraproject.org> - 1.4-0.7.20091129svn

More information about the scm-commits mailing list