Accepting request 39242 from X11:Utilities
checked in (request 39242) OBS-URL: https://build.opensuse.org/request/show/39242 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xli?expand=0&rev=6
This commit is contained in:
OBS User autobuild
Git OBS Bridge
parent
11c68dcd2c
commit
a9a1d23ff7
@ -1,6 +1,4 @@
|
||||
Index: pcx.c
|
||||
===================================================================
|
||||
--- pcx.c.orig
|
||||
--- pcx.c
|
||||
+++ pcx.c
|
||||
@@ -5,6 +5,8 @@
|
||||
** Adapted from code by Jef Poskanzer (see Copyright below).
|
||||
@ -22,7 +20,7 @@ Index: pcx.c
|
||||
|
||||
|
||||
/*
|
||||
@@ -129,35 +133,43 @@ Image *pcxLoad (char *fullname, ImageOpt
|
||||
@@ -129,35 +133,43 @@
|
||||
xmax = xmax - xmin + 1;
|
||||
ymax = ymax - ymin + 1;
|
||||
in_bpr = pcxhd[66] + ( 256 * pcxhd[67] );
|
||||
@ -75,7 +73,7 @@ Index: pcx.c
|
||||
|
||||
read_trail_opt(image_ops,zf,image,verbose);
|
||||
zclose(zf);
|
||||
@@ -173,7 +185,8 @@ Image *pcxLoad (char *fullname, ImageOpt
|
||||
@@ -173,7 +185,8 @@
|
||||
** Returns FALSE if there was a short read.
|
||||
*/
|
||||
|
||||
@ -85,7 +83,7 @@ Index: pcx.c
|
||||
{
|
||||
/* Goes like this: Read a byte. If the two high bits are set,
|
||||
** then the low 6 bits contain a repeat count, and the byte to
|
||||
@@ -185,10 +198,12 @@ static boolean PCX_LoadImage (ZFILE *zf,
|
||||
@@ -185,10 +198,12 @@
|
||||
int row = 0;
|
||||
int bytes_this_row = 0;
|
||||
int b, i, cnt;
|
||||
@ -99,7 +97,7 @@ Index: pcx.c
|
||||
|
||||
if ((b & 0xC0) == 0xC0) {
|
||||
/* have a repetition count -- mask flag bits */
|
||||
@@ -201,12 +216,14 @@ static boolean PCX_LoadImage (ZFILE *zf,
|
||||
@@ -201,12 +216,14 @@
|
||||
cnt = 1; /* no repeating this one */
|
||||
}
|
||||
|
||||
@ -116,7 +114,7 @@ Index: pcx.c
|
||||
if (++bytes_this_row == in_bpr) {
|
||||
/* start of a new line */
|
||||
row++;
|
||||
@@ -214,6 +231,25 @@ static boolean PCX_LoadImage (ZFILE *zf,
|
||||
@@ -214,6 +231,25 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,8 +1,6 @@
|
||||
Index: Imakefile
|
||||
===================================================================
|
||||
--- Imakefile.orig
|
||||
--- Imakefile
|
||||
+++ Imakefile
|
||||
@@ -19,7 +19,7 @@ JPEG_LDFLAGS =
|
||||
@@ -19,7 +19,7 @@
|
||||
PNG_INCLUDES =
|
||||
PNG_LDFLAGS =
|
||||
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
Index: ddxli.h
|
||||
===================================================================
|
||||
--- ddxli.h.orig
|
||||
--- ddxli.h
|
||||
+++ ddxli.h
|
||||
@@ -36,11 +36,13 @@
|
||||
|
||||
@ -16,11 +14,9 @@ Index: ddxli.h
|
||||
#endif
|
||||
#ifndef bfill
|
||||
#define bfill(P,N,C) memset((P),(C),(N))
|
||||
Index: faces.c
|
||||
===================================================================
|
||||
--- faces.c.orig
|
||||
--- faces.c
|
||||
+++ faces.c
|
||||
@@ -56,9 +56,15 @@ isFaces(ZFILE *zf, char *name, char *fna
|
||||
@@ -56,9 +56,15 @@
|
||||
if (! strcmp(buf, "\n"))
|
||||
break;
|
||||
if (!strncmp(buf, "FirstName:", 10))
|
||||
@ -38,11 +34,9 @@ Index: faces.c
|
||||
else if (!strncmp(buf, "Image:", 6)) {
|
||||
if (sscanf(buf + 7, "%d%d%d", &iw, &ih, &id) != 3) {
|
||||
fprintf(stderr,"facesLoad: %s - Bad image\n", name);
|
||||
Index: reduce.c
|
||||
===================================================================
|
||||
--- reduce.c.orig
|
||||
--- reduce.c
|
||||
+++ reduce.c
|
||||
@@ -178,7 +178,8 @@ Image *reduce(Image *image, unsigned col
|
||||
@@ -178,7 +178,8 @@
|
||||
/* get destination image */
|
||||
depth = colorsToDepth(OutColors);
|
||||
new_image = newRGBImage(image->width, image->height, depth);
|
||||
@ -52,11 +46,9 @@ Index: reduce.c
|
||||
new_image->title = dupString(buf);
|
||||
new_image->gamma = image->gamma;
|
||||
|
||||
Index: zoom.c
|
||||
===================================================================
|
||||
--- zoom.c.orig
|
||||
--- zoom.c
|
||||
+++ zoom.c
|
||||
@@ -52,28 +52,29 @@ Image *zoom(Image *oimage, unsigned int
|
||||
@@ -52,28 +52,29 @@
|
||||
if (verbose)
|
||||
printf(" Zooming image Y axis by %d%%...", yzoom);
|
||||
if (changetitle)
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
Index: ddxli.h
|
||||
===================================================================
|
||||
--- ddxli.h.orig
|
||||
+++ ddxli.h
|
||||
--- ddxli.h 1999-10-25 04:14:53.000000000 +0200
|
||||
+++ ddxli.h 2005-09-08 12:07:33.948259924 +0200
|
||||
@@ -14,7 +14,7 @@
|
||||
#include <sys/shm.h>
|
||||
#include <X11/extensions/XShm.h>
|
||||
@ -11,10 +9,8 @@ Index: ddxli.h
|
||||
#include <string.h>
|
||||
#ifndef index /* some SysV's do this for you */
|
||||
#define index strchr
|
||||
Index: Imakefile
|
||||
===================================================================
|
||||
--- Imakefile.orig
|
||||
+++ Imakefile
|
||||
--- Imakefile 2005-09-05 07:01:30.000000000 +0200
|
||||
+++ Imakefile 2005-09-08 12:07:33.931258518 +0200
|
||||
@@ -9,7 +9,7 @@
|
||||
# -DHAVE_BOOLEAN if your system declares 'boolean' somewhere
|
||||
# -DHAVE_BUNZIP2 if you have bzip2 and want to handle .bz2 files
|
||||
@ -24,7 +20,7 @@ Index: Imakefile
|
||||
CCOPTIONS = -Aa -D_HPUX_SOURCE
|
||||
#endif
|
||||
|
||||
@@ -38,8 +38,8 @@ ComplexProgramTarget_2(xlito,,)
|
||||
@@ -38,8 +38,8 @@
|
||||
|
||||
install:: $(SYSPATHFILE)
|
||||
$(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
|
||||
@ -35,11 +31,9 @@ Index: Imakefile
|
||||
|
||||
$(SYSPATHFILE):
|
||||
@echo "*** Creating default $(SYSPATHFILE) since you"
|
||||
Index: root.c
|
||||
===================================================================
|
||||
--- root.c.orig
|
||||
+++ root.c
|
||||
@@ -55,8 +55,8 @@ static void freePrevious(Display * dpy,
|
||||
--- root.c 2005-09-05 07:01:30.000000000 +0200
|
||||
+++ root.c 2005-09-08 12:07:34.013265302 +0200
|
||||
@@ -55,8 +55,8 @@
|
||||
Pixmap *pm;
|
||||
Atom actual_type; /* NOTUSED */
|
||||
int format;
|
||||
@ -50,7 +44,7 @@ Index: root.c
|
||||
|
||||
/* intern the property name */
|
||||
Atom atom = XInternAtom(dpy, RETAIN_PROP_NAME, 0);
|
||||
@@ -64,8 +64,7 @@ static void freePrevious(Display * dpy,
|
||||
@@ -64,8 +64,7 @@
|
||||
/* look for existing resource allocation */
|
||||
if ((XGetWindowProperty(dpy, w, atom, 0, 1, 1 /*delete */ ,
|
||||
AnyPropertyType, &actual_type, &format,
|
||||
@ -60,7 +54,7 @@ Index: root.c
|
||||
(unsigned char **) &pm) == Success) &&
|
||||
nitems == 1) {
|
||||
if ((actual_type == XA_PIXMAP) && (format == 32) &&
|
||||
@@ -162,14 +161,13 @@ void imageOnRoot(DisplayInfo * dinfo, Im
|
||||
@@ -162,14 +161,13 @@
|
||||
for (i = 0; i < numChildren; i++) {
|
||||
Atom actual_type;
|
||||
int actual_format;
|
||||
|
||||
@ -1,6 +1,4 @@
|
||||
Index: png.c
|
||||
===================================================================
|
||||
--- png.c.orig
|
||||
--- png.c
|
||||
+++ png.c
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
@ -11,7 +9,7 @@ Index: png.c
|
||||
static int check_png(char *file_name)
|
||||
{
|
||||
ZFILE *zfp;
|
||||
@@ -27,7 +27,7 @@ static int check_png(char *file_name)
|
||||
@@ -27,7 +27,7 @@
|
||||
if (ret != 8)
|
||||
return 0;
|
||||
|
||||
|
||||
16
xli.changes
16
xli.changes
@ -1,20 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat May 1 09:08:08 UTC 2010 - prusnak@suse.cz
|
||||
|
||||
- provide also xloadimage
|
||||
- cleanup specfile
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Apr 4 18:51:25 CEST 2010 - ro@suse.de
|
||||
|
||||
- fix build with libpng14
|
||||
- fix build with libpng14
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 13 17:18:59 CEST 2007 - lmichnovic@suse.cz
|
||||
|
||||
- update to new snapshot 2006/11/10
|
||||
* fixing a crash on PGM/PPM images with a maxval > 255,
|
||||
and various warnings about uninitialized variables.
|
||||
* fixing a crash on PGM/PPM images with a maxval > 255,
|
||||
and various warnings about uninitialized variables.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 9 07:42:34 CET 2007 - aj@suse.de
|
||||
@ -53,8 +47,8 @@ Fri Oct 14 16:29:08 CEST 2005 - lmichnovic@suse.cz
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 8 12:16:53 CEST 2005 - ltinkl@suse.cz
|
||||
|
||||
- update to snapshot 2005-09-04 which incorporates fixes for
|
||||
the previous security bug (#66139) and fullscreen handling
|
||||
- update to snapshot 2005-09-04 which incorporates fixes for
|
||||
the previous security bug (#66139) and fullscreen handling
|
||||
(#115258)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
67
xli.spec
67
xli.spec
@ -18,8 +18,12 @@
|
||||
|
||||
|
||||
Name: xli
|
||||
BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel
|
||||
%define ver 2005-09-04
|
||||
License: MIT
|
||||
Group: System/X11/Utilities
|
||||
Provides: xli115
|
||||
AutoReqProv: on
|
||||
Version: 20061110
|
||||
Release: 126
|
||||
Summary: X11 Image Loading Utility
|
||||
@ -31,9 +35,33 @@ Patch2: xli-1.17.0-8bit_palette.patch
|
||||
Patch3: xli-1.17.0-configfile.patch
|
||||
Patch4: xli-png_check_sig.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libjpeg-devel libpng-devel xorg-x11-devel
|
||||
Provides: xli115
|
||||
Provides: xloadimage = %{version}
|
||||
%if "%(xft-config --prefix)" == "/usr"
|
||||
%define _xorg7libs %_lib
|
||||
%define _xorg7libs32 lib
|
||||
%define _xorg7bin bin
|
||||
%define _xorg7_mandir %_mandir
|
||||
%define _xorg7pixmaps include
|
||||
%define _xorg7libshare share
|
||||
%define _xorg7_xkb /usr/share/X11/xkb
|
||||
%define _xorg7_termcap /usr/lib/X11/etc
|
||||
%define _xorg7_serverincl /usr/include/xorg
|
||||
%define _xorg7_fonts /usr/share/fonts
|
||||
#%define _xorg7_config /usr/share/X11/config #use libshare macro
|
||||
%define _xorg7_prefix /usr
|
||||
%else
|
||||
%define _xorg7libs X11R6/%_lib
|
||||
%define _xorg7libs32 X11R6/lib
|
||||
%define _xorg7bin X11R6/bin
|
||||
%define _xorg7_mandir /usr/X11R6/man
|
||||
%define _xorg7pixmaps X11R6/include
|
||||
%define _xorg7libshare X11R6/lib/
|
||||
%define _xorg7_xkb /etc/X11/xkb
|
||||
%define _xorg7_termcap /usr/X11R6/lib/X11/etc
|
||||
%define _xorg7_serverincl /usr/X11R6/lib/Server/include
|
||||
%define _xorg7_fonts /usr/X11R6/lib/X11/fonts
|
||||
#%define _xorg7_config /usr/X11R6/lib/X11/config #use libshare macro
|
||||
%define _xorg7_prefix /usr/X11R6
|
||||
%endif
|
||||
|
||||
%description
|
||||
xli is a version of xloadimage.
|
||||
@ -41,24 +69,29 @@ xli is a version of xloadimage.
|
||||
This utility will view several types of images under X11, or load
|
||||
images onto the X11 root window.
|
||||
|
||||
|
||||
|
||||
Authors:
|
||||
--------
|
||||
Graeme Gill <GraemeGill@access.net.au>
|
||||
Smarasderagd <smar@reptiles.org>
|
||||
|
||||
%prep
|
||||
%setup -q -n xli-2006-11-10
|
||||
%patch0
|
||||
%patch1
|
||||
%patch2
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3
|
||||
%patch4
|
||||
|
||||
%build
|
||||
xmkmf -a
|
||||
make %{?_smp_mflags} all CCOPTIONS="$RPM_OPT_FLAGS"
|
||||
make %{?jobs:-j%jobs} all CCOPTIONS="$RPM_OPT_FLAGS -fstack-protector"
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/lib/X11
|
||||
make BINDIR=$RPM_BUILD_ROOT%{_bindir} install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install.man
|
||||
ln -s xli $RPM_BUILD_ROOT%{_bindir}/xloadimage
|
||||
ln -s xli.1x.gz $RPM_BUILD_ROOT%{_mandir}/man1/xloadimage.1x.gz
|
||||
make BINDIR=$RPM_BUILD_ROOT/usr/%{_xorg7bin} install
|
||||
make DESTDIR=$RPM_BUILD_ROOT install.man
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -66,14 +99,12 @@ rm -rf $RPM_BUILD_ROOT
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README* ABOUTGAMMA
|
||||
%doc %{_mandir}/man1/xli.1x.gz
|
||||
%doc %{_mandir}/man1/xlito.1x.gz
|
||||
%doc %{_mandir}/man1/xloadimage.1x.gz
|
||||
%{_bindir}/xli
|
||||
%{_bindir}/xlito
|
||||
%{_bindir}/xloadimage
|
||||
%{_bindir}/xsetbg
|
||||
%{_bindir}/xview
|
||||
%doc %{_xorg7_mandir}/man1/xli.1x.gz
|
||||
%doc %{_xorg7_mandir}/man1/xlito.1x.gz
|
||||
/usr/%{_xorg7bin}/xli
|
||||
/usr/%{_xorg7bin}/xlito
|
||||
/usr/%{_xorg7bin}/xsetbg
|
||||
/usr/%{_xorg7bin}/xview
|
||||
/usr/lib/X11/Xli
|
||||
|
||||
%changelog
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user