From 82351ff61981266a965a824a581bd2d7a66331d452d2d78e0c4901c28442e372 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 26 Jul 2024 08:34:56 +0000 Subject: [PATCH] - Update to version 2.1: - added #include in some C files to prevent compiler warnings with newer gcc - update configure.in for use with libnetpbm-11 (that includes libpgm now) and run 'autoreconf -i' OBS-URL: https://build.opensuse.org/package/show/graphics/imgvtopgm?expand=0&rev=13 --- .gitattributes | 23 +++++++++ .gitignore | 1 + imgvtopgm-2.0-warnings-fix.diff | 71 ++++++++++++++++++++++++++ imgvtopgm-2.0.tar.gz | 3 ++ imgvtopgm-2.1.tar.gz | 3 ++ imgvtopgm-lib-cleanup.patch | 72 ++++++++++++++++++++++++++ imgvtopgm.changes | 89 +++++++++++++++++++++++++++++++++ imgvtopgm.spec | 60 ++++++++++++++++++++++ 8 files changed, 322 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 imgvtopgm-2.0-warnings-fix.diff create mode 100644 imgvtopgm-2.0.tar.gz create mode 100644 imgvtopgm-2.1.tar.gz create mode 100644 imgvtopgm-lib-cleanup.patch create mode 100644 imgvtopgm.changes create mode 100644 imgvtopgm.spec diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/imgvtopgm-2.0-warnings-fix.diff b/imgvtopgm-2.0-warnings-fix.diff new file mode 100644 index 0000000..4ad8189 --- /dev/null +++ b/imgvtopgm-2.0-warnings-fix.diff @@ -0,0 +1,71 @@ +--- ipdb_c.c ++++ ipdb_c.c +@@ -28,6 +28,8 @@ + #include + #include + ++#include ++ + static char *errors[] = { + /* E_BADCOLORS */ + "Invalid palette, only {0x00, 0x55, 0xAA, 0xFF} allowed.", +--- imgvinfo.c.xx 2005-06-23 10:02:44.000000000 +0200 ++++ imgvinfo.c 2005-06-23 10:02:51.000000000 +0200 +@@ -24,6 +24,7 @@ + MU_ID("$Mu: imgvtopgm/imgvinfo.c 1.21 1999/05/09 07:58:02 $") + + #include ++#include + #include + + #include +--- ipdb_r.c.xx 2005-06-23 10:02:57.000000000 +0200 ++++ ipdb_r.c 2005-06-23 10:03:05.000000000 +0200 +@@ -20,6 +20,7 @@ + * + * Authors: Eric A. Howe (mu@trends.net) + */ ++#include + #include + MU_ID("$Mu: imgvtopgm/ipdb_r.c 1.13 1999/05/09 08:00:47 $") + +--- imgvtopnm.c.xx 2005-06-23 10:03:12.000000000 +0200 ++++ imgvtopnm.c 2005-06-23 10:03:18.000000000 +0200 +@@ -24,6 +24,7 @@ + MU_ID("$Mu: imgvtopgm/imgvtopnm.c 1.6 1999/05/09 08:15:49 $") + + #include ++#include + + #include + +--- pgmtoimgv.c.xx 2005-06-23 10:02:25.000000000 +0200 ++++ pgmtoimgv.c 2005-06-23 10:02:31.000000000 +0200 +@@ -24,6 +24,7 @@ + MU_ID("$Mu: imgvtopgm/pgmtoimgv.c 1.28 1999/05/09 08:27:51 $") + + #include ++#include + #include + + #include +--- ipdb_w.c.xx 2005-06-23 10:03:23.000000000 +0200 ++++ ipdb_w.c 2005-06-23 10:03:29.000000000 +0200 +@@ -20,6 +20,7 @@ + * + * Authors: Eric A. Howe (mu@trends.net) + */ ++#include + #include + MU_ID("$Mu: imgvtopgm/ipdb_w.c 1.19 1999/05/09 08:01:47 $") + +--- pbmtoimgv.c.xx 2005-06-23 10:03:39.000000000 +0200 ++++ pbmtoimgv.c 2005-06-23 10:03:45.000000000 +0200 +@@ -24,6 +24,7 @@ + MU_ID("$Mu: imgvtopgm/pbmtoimgv.c 1.12 1998/12/16 18:25:11 $") + + #include ++#include + #include + + #include diff --git a/imgvtopgm-2.0.tar.gz b/imgvtopgm-2.0.tar.gz new file mode 100644 index 0000000..8aaa7a3 --- /dev/null +++ b/imgvtopgm-2.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:38c893694afe47d68b75711d886e6db41caaffb8879fe608981ef04bdaa7da53 +size 252217 diff --git a/imgvtopgm-2.1.tar.gz b/imgvtopgm-2.1.tar.gz new file mode 100644 index 0000000..78bf6a5 --- /dev/null +++ b/imgvtopgm-2.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5d2c3936af9d8d77cc8c756c500f8475ef12d6acd8bd569d89bba7d8fed4e48 +size 310604 diff --git a/imgvtopgm-lib-cleanup.patch b/imgvtopgm-lib-cleanup.patch new file mode 100644 index 0000000..e24f2e9 --- /dev/null +++ b/imgvtopgm-lib-cleanup.patch @@ -0,0 +1,72 @@ +Index: imgvtopgm-2.0.orig/configure +=================================================================== +--- imgvtopgm-2.0.orig.orig/configure ++++ imgvtopgm-2.0.orig/configure +@@ -2358,14 +2358,14 @@ CPPFLAGS="$CPPFLAGS $X_CFLAGS" + LDFLAGS="$LDFLAGS $X_LIBS" + + PBM_LIBS="" +-echo $ac_n "checking for pbm_init in -lpbm""... $ac_c" 1>&6 +-echo "configure:2363: checking for pbm_init in -lpbm" >&5 ++echo $ac_n "checking for pbm_init in -lnetpbm""... $ac_c" 1>&6 ++echo "configure:2363: checking for pbm_init in -lnetpbm" >&5 + ac_lib_var=`echo pbm'_'pbm_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpbm $LIBS" ++LIBS="-lnetpbm $LIBS" + cat > conftest.$ac_ext <&6 +- PBM_LIBS="$PNM_LIBS -lpbm" ++ PBM_LIBS="$PNM_LIBS -lnetpbm" + else + echo "$ac_t""no" 1>&6 + fi + + if test "$PBM_LIBS" = ""; then +-{ echo "configure: error: The PBM library '-lpbm' could not be found. ++{ echo "configure: error: The PBM library '-lnetpbm' could not be found. + Please use the configure options '--with-pnm-includes=DIR' + and '--with-pnm-libraries=DIR' to specify the netpbm location. + See the 'config.log' file for further diagnostics." 1>&2; exit 1; } +@@ -2407,14 +2407,14 @@ fi + + + PGM_LIBS="" +-echo $ac_n "checking for pgm_init in -lpgm""... $ac_c" 1>&6 +-echo "configure:2412: checking for pgm_init in -lpgm" >&5 ++echo $ac_n "checking for pgm_init in -lnetpbm""... $ac_c" 1>&6 ++echo "configure:2412: checking for pgm_init in -lnetpbm" >&5 + ac_lib_var=`echo pgm'_'pgm_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpgm $PNM_LIBS ${PBM_LIBS} $LIBS" ++LIBS="-lnetpbm $PNM_LIBS ${PBM_LIBS} $LIBS" + cat > conftest.$ac_ext <&6 +- PGM_LIBS="$PNM_LIBS -lpgm" ++ PGM_LIBS="$PNM_LIBS -lnetpbm" + else + echo "$ac_t""no" 1>&6 + fi + + if test "$PGM_LIBS" = ""; then +-{ echo "configure: error: The PGM library '-lpgm' could not be found. ++{ echo "configure: error: The PGM library '-lnetpbm' could not be found. + Please use the configure options '--with-pnm-includes=DIR' + and '--with-pnm-libraries=DIR' to specify the netpbm location. + See the 'config.log' file for further diagnostics." 1>&2; exit 1; } diff --git a/imgvtopgm.changes b/imgvtopgm.changes new file mode 100644 index 0000000..1024b8e --- /dev/null +++ b/imgvtopgm.changes @@ -0,0 +1,89 @@ +------------------------------------------------------------------- +Fri Jul 26 07:11:59 UTC 2024 - Frantisek Simorda + +- Update to version 2.1: + - added #include in some C files to prevent compiler + warnings with newer gcc + - update configure.in for use with libnetpbm-11 (that includes + libpgm now) and run 'autoreconf -i' + + +------------------------------------------------------------------- +Thu Feb 22 08:06:42 UTC 2024 - Michael Vetter + +- Use %patch -P N instead of deprecated %patchN. +- Use %license + +------------------------------------------------------------------- +Thu May 19 09:24:32 UTC 2022 - Marcus Meissner + +- switch to https urls + +------------------------------------------------------------------- +Thu Jul 30 11:31:31 UTC 2015 - dimstar@opensuse.org + +- Add imgvtopgm-lib-cleanup.patch: cleanup usage of libraries after + netpbm has been changed to no loner provide all compatibility + names (due to conflicts with openpgm). + +------------------------------------------------------------------- +Sun Oct 5 20:41:13 UTC 2014 - jengelh@inai.de + +- Update homepage URL, remove ancient/redundant sections from + specfile, use modern macros. + +------------------------------------------------------------------- +Fri Aug 10 01:11:15 CEST 2007 - ro@suse.de + +- added libnetpbm-devel to buildreq + +------------------------------------------------------------------- +Wed May 24 21:35:12 CEST 2006 - schwab@suse.de + +- Don't strip binaries. + +------------------------------------------------------------------- +Wed Jan 25 21:36:36 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Tue Aug 2 01:08:08 CEST 2005 - ro@suse.de + +- add -lm to help configure with netpbm + +------------------------------------------------------------------- +Thu Jun 23 10:05:05 CEST 2005 - meissner@suse.de + +- use RPM_OPT_FLAGS, fixed all implicit warnings. + +------------------------------------------------------------------- +Mon Apr 26 12:02:52 CEST 2004 - postadal@suse.cz + +- fixed gcc warnings + +------------------------------------------------------------------- +Sun Jan 11 11:01:50 CET 2004 - adrian@suse.de + +- add %defattr + +------------------------------------------------------------------- +Tue Sep 17 17:34:28 CEST 2002 - ro@suse.de + +- removed bogus self-provides + +------------------------------------------------------------------- +Tue Nov 13 11:36:27 CEST 2001 - tcrhak@suse.cz + +- removed aclocal, autoconf and automake + +------------------------------------------------------------------- +Mon Jul 30 19:36:56 CEST 2001 - adostal@suse.cz + +- change gz to bz2 + +------------------------------------------------------------------- +Tue Feb 13 11:34:34 CET 2001 - pblaha@suse.cz + +- create this package for view images on Palm + diff --git a/imgvtopgm.spec b/imgvtopgm.spec new file mode 100644 index 0000000..bd7c441 --- /dev/null +++ b/imgvtopgm.spec @@ -0,0 +1,60 @@ +# +# spec file for package imgvtopgm +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +Name: imgvtopgm +Version: 2.1 +Release: 0 +Summary: Palm Pilot Image Viewer to PGM Converter +License: GPL-2.0-or-later +Group: Productivity/Graphics/Convertors +URL: https://sf.net/projects/imgvtopgm/ + +#SVN-Clone: svn://svn.code.sf.net/p/imgvtopgm/code/trunk +Source: https://downloads.sf.net/%name/%name-%version.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: libnetpbm-devel +Requires: netpbm + +%description +Tools for converting Pilot Image Viewer pdb files to and from Portable +Graymaps and Portable Bitmaps. The tools support grayscale and +monochrome images with or without compression and with or without +notes. + +If you are looking for a cool (and free) image viewer for your Pilot, +you should look at TinyViewer (http://www.righto.com/pilot/tv.html). + +%prep +%setup -qn %name-%version + +%build +%configure +make %{?_smp_mflags} + +%install +%make_install + +%files +%defattr(-,root,root) +%license COPYING +%doc AUTHORS CREDITS INSTALL NEWS Pilot16 ChangeLog Pilot README +%doc samples/ +%_bindir/* +%_mandir/man1/*.1* + +%changelog