SHA256
1
0
forked from pool/imgvtopgm

Accepting request 1189740 from graphics

- Update to version 2.1:
        - added #include <string.h> 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'
- imgvtopgm-lib-cleanup.patch: removed
- imgvtopgm-2.0-warnings-fix.diff: upstream

OBS-URL: https://build.opensuse.org/request/show/1189740
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/imgvtopgm?expand=0&rev=20
This commit is contained in:
Dominique Leuenberger 2024-07-26 14:16:13 +00:00 committed by Git OBS Bridge
commit 6c9cd96421
6 changed files with 16 additions and 152 deletions

View File

@ -1,71 +0,0 @@
--- ipdb_c.c
+++ ipdb_c.c
@@ -28,6 +28,8 @@
#include <mine/ipdb.h>
#include <mine/ipdbP.h>
+#include <string.h>
+
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 <time.h>
+#include <string.h>
#include <stdlib.h>
#include <mine/ipdb.h>
--- 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 <string.h>
#include <mine/slop.h>
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 <stdlib.h>
+#include <string.h>
#include <mine/ipdb.h>
--- 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 <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <mine/ipdb.h>
--- 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 <string.h>
#include <mine/slop.h>
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 <stdlib.h>
+#include <string.h>
#include <sys/stat.h>
#include <mine/ipdb.h>

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38c893694afe47d68b75711d886e6db41caaffb8879fe608981ef04bdaa7da53
size 252217

3
imgvtopgm-2.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f5d2c3936af9d8d77cc8c756c500f8475ef12d6acd8bd569d89bba7d8fed4e48
size 310604

View File

@ -1,72 +0,0 @@
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 <<EOF
#line 2371 "configure"
#include "confdefs.h"
@@ -2393,13 +2393,13 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&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 <<EOF
#line 2420 "configure"
#include "confdefs.h"
@@ -2442,13 +2442,13 @@ LIBS="$ac_save_LIBS"
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&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; }

View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Fri Jul 26 07:11:59 UTC 2024 - Frantisek Simorda <frantisek.simorda@suse.com>
- Update to version 2.1:
- added #include <string.h> 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'
- imgvtopgm-lib-cleanup.patch: removed
- imgvtopgm-2.0-warnings-fix.diff: upstream
-------------------------------------------------------------------
Thu Feb 22 08:06:42 UTC 2024 - Michael Vetter <mvetter@suse.com>

View File

@ -17,7 +17,7 @@
Name: imgvtopgm
Version: 2.0
Version: 2.1
Release: 0
Summary: Palm Pilot Image Viewer to PGM Converter
License: GPL-2.0-or-later
@ -26,8 +26,6 @@ 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
Patch0: %{name}-%{version}-warnings-fix.diff
Patch1: imgvtopgm-lib-cleanup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libnetpbm-devel
Requires: netpbm
@ -42,9 +40,7 @@ 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.orig
%patch -P 0
%patch -P 1 -p1
%setup -qn %name-%version
%build
%configure