Hello community, here is the log from the commit of package gv for openSUSE:Factory checked in at 2013-02-28 07:10:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gv (Old) and /work/SRC/openSUSE:Factory/.gv.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gv", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/gv/gv.changes 2013-02-25 20:34:40.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.gv.new/gv.changes 2013-02-28 10:17:26.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 26 17:00:33 UTC 2013 - [email protected] + +- Add patch gv-3.7.2-libzio.dif: make libzio usable (bnc#805149) + +------------------------------------------------------------------- New: ---- gv-3.7.2-libzio.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gv.spec ++++++ --- /var/tmp/diff_new_pack.avSHZZ/_old 2013-02-28 10:17:27.000000000 +0100 +++ /var/tmp/diff_new_pack.avSHZZ/_new 2013-02-28 10:17:27.000000000 +0100 @@ -19,6 +19,8 @@ Name: gv BuildRequires: automake BuildRequires: help2man +BuildRequires: libbz2-devel +BuildRequires: libzio-devel BuildRequires: makeinfo BuildRequires: update-desktop-files BuildRequires: xorg-x11 @@ -28,6 +30,8 @@ %else BuildRequires: xaw3d %endif +BuildRequires: xz-devel +BuildRequires: zlib-devel %if %suse_version < 1100 BuildRequires: desktop-data-SuSE %endif @@ -48,6 +52,8 @@ Source2: gv.png Patch1: gv-3.7.0.dif Patch2: gv-3.7.0-I18N-mb.patch +# PATCH-FIX-OPENSUSE: make libzio usable +Patch3: gv-3.7.2-libzio.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build %{expand: %%global _exec_prefix %(type -p pkg-config &>/dev/null && pkg-config --variable prefix x11 || echo /usr/X11R6)} %if "%_exec_prefix" == "/usr/X11R6" @@ -77,8 +83,9 @@ %prep %setup echo >> src/Makefile.am -%patch1 -p0 -%patch2 -p0 +%patch1 -p0 -b .one +%patch2 -p0 -b .two +%patch3 -p0 -b .zio %build autoreconf -fis ++++++ gv-3.7.2-libzio.dif ++++++ --- configure.ac +++ configure.ac 2013-02-26 17:06:18.609444764 +0000 @@ -73,6 +73,14 @@ AC_CHECK_HEADER(bzlib.h,[ do AC_CHECK_LIB($lib, BZ2_bzopen, [LIBS="$LIBS -l$lib" ; break]) done]) +AC_CHECK_HEADER(lzmadec.h, [ + for lib in lzma lzmadec; do + AC_CHECK_LIB($lib, lzmadec_open, [LIBS="$LIBS -l$lib"; break]) + done]) + AC_CHECK_HEADER(lzma.h, [ + for lib in lzma; do + AC_CHECK_LIB($lib, lzma_easy_encoder, [LIBS="$LIBS -l$lib"; break]) + done]) AC_CHECK_HEADER(zio.h,[ AC_CHECK_LIB(zio, fzopen, [LIBS="$LIBS -lzio" ; AC_DEFINE(HAVE_ZIO, 1, [Have ZIO Library])],[LIBS=$savedLIBS]) ],[LIBS=$savedLIBS]) --- src/ps.c +++ src/ps.c 2013-02-26 16:58:04.321444640 +0000 @@ -385,10 +385,11 @@ psscan(fileP,filename,filename_raw,filen int ignore_dsc; /* Derived from scanstyle. If set the document structure will be ignored. */ - unsigned char b[3]; /* The first 3 bytes of the input file */ + unsigned char b[5]; /* The first 3 bytes of the input file */ BEGINMESSAGE(psscan) +#ifndef HAVE_ZIO if (cmd_uncompress) { if ( fread(b, sizeof(char), 3, *fileP) != 3 || /* If ((read error) OR */ ( memcmp(b, "\037\235", 2) != 0 && /* (not compress AND */ @@ -398,6 +399,21 @@ psscan(fileP,filename,filename_raw,filen cmd_uncompress=NULL; } } +#else + if (cmd_uncompress) { + if ( fread(b, sizeof(char), 5, *fileP) != 5 || /* If read error OR */ + ( memcmp(b, "\037\235", 2) != 0 && /* not compress */ + memcmp(b, "\037\236", 2) != 0 && + memcmp(b, "\037\213", 2) != 0 && /* not gzip */ + memcmp(b, "BZh", 3) != 0 && /* not bzip2 */ + memcmp(b, "]\0\0\200",5) != 0 && + memcmp(b, "\377LZMA", 5) != 0 && + memcmp(b, "\3757zXZ", 5) != 0 )) { + rewind(*fileP); + cmd_uncompress=NULL; + } + } +#endif #ifndef HAVE_ZIO if (cmd_uncompress) { struct document *retval = NULL; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
