rpms/xv/devel DISTRIBUTE.txt, NONE, 1.1 xv-jumbo-20070520-imc.patch, NONE, 1.1 xv-jumbo-20070520-makefile.patch, NONE, 1.1 xv.desktop, NONE, 1.1 xv.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
3:20 p.m.
Author: thl
Update of /cvs/free/rpms/xv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26396
Modified Files:
.cvsignore sources
Added Files:
DISTRIBUTE.txt xv-jumbo-20070520-imc.patch
xv-jumbo-20070520-makefile.patch xv.desktop xv.spec
Log Message:
initial import from livna
--- NEW FILE DISTRIBUTE.txt ---
From: John Bradley <bradley(a)trilon.com>
To: "L. Gabriel Somlo" <somlo(a)cmu.edu>
Subject: RE: May I submit xv + jumbo patches to Livna ?
Date: Tue, 11 Dec 2007 15:49:55 -0500
Glad to hear that xv is still of use to someone. :)
One of the nice features of "never updated" software is that
(eventually) all the more obvious bugs get patched -- and the program,
while primitive by today's standards, probably *screams*. (It ran pretty
well on computers that were 10-100 times slower than today's hardware.)
New features? Pah! Who needs 'em?!? :D
Yes, please, go ahead, patch it as needed and distribute it anywhere you
think is appropriate. (I no longer follow the Unix/Linux 'scene', so I
defer to your judgement on that.)
--jhb
------------------------------------------------------------------
Enjoy the moderately-entertaining and never-updated World of XV:
http://www.trilon.com/xv
------------------------------------------------------------------
-----Original Message-----
From: L. Gabriel Somlo [mailto:somlo@cmu.edu]
Sent: Sunday, December 09, 2007 10:10 PM
To: bradley(a)cis.upenn.edu
Cc: xv(a)trilon.com; kirchh(a)trilon.com; newt(a)pobox.com
Subject: May I submit xv + jumbo patches to Livna ?
Mr. Bradley,
I am a huge fan of your xv program, and have been using
it on my home Linux box to view images such as family
photos for over 10 years.
I adamantly refuse to use other alternatives included by
default with with my linux distribution (Fedora), mainly
because of the nice and intuitive interface that xv offers.
I am writing to you because I would like to submit xv to
the Livna repository (soon to merge with RPMfusion).
Livna (rpm.livna.org) is a repository of packages built for
Fedora, but which could not be directly included into Fedora
for various reasons (such as a non-opensource license).
I believe adding xv to Livna would be mostly consistent with
the spirit of your license: non-commercial distribution, not
bundled with any other product (Livna is a repository of
various software packages for Fedora, and does not sell or
otherwise distribute CDs containing multiple packages).
The only potential issue is that I would like to apply
Greg Roelofs' jumbo patches available from
http://sonic.net/~roelofs/greg_xv.html
making the resulting build a "modified" version according
to a strict interpretation of the license.
I would like to have your blessing to proceed with this
endeavor. I believe the end result to be in everyone's
mutual interest, as a wider-scale distribution of xv will
generate a wider pool of users who might potentially
purchase a commercial license.
Sincerely,
Gabriel Somlo
PS. The not-yet-submitted source RPM file can be found at
http://www.contrib.andrew.cmu.edu/~somlo/
for your perusal.
xv-jumbo-20070520-imc.patch:
--- NEW FILE xv-jumbo-20070520-imc.patch ---
diff -NarU5 xv-3.10a.orig/xvdir.c xv-3.10a/xvdir.c
--- xv-3.10a.orig/xvdir.c 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/xvdir.c 2008-01-18 14:50:30.000000000 -0500
@@ -538,11 +538,12 @@
if (i >= 0) changedDirMB(i);
return -1;
}
/* handle clicks inside the filename box */
- if (x > 80 &&
+ if (enPos > stPos &&
+ x > 80 &&
y > dList.y + (int) dList.h + 30 &&
x < 80 + DNAMWIDE+6 &&
y < dList.y + (int) dList.h + 30 + LINEHIGH+5) {
int tx;
int dx;
diff -NarU5 xv-3.10a.orig/xvmisc.c xv-3.10a/xvmisc.c
--- xv-3.10a.orig/xvmisc.c 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/xvmisc.c 2008-01-18 14:37:25.000000000 -0500
@@ -559,14 +559,10 @@
#ifdef HAVE_MGCSFX
if (mgcsfxW) XDestroyWindow(theDisp, mgcsfxW);
#endif
-#ifdef HAVE_PNG
- if (pngW) XDestroyWindow(theDisp, pngW);
-#endif
-
/* if NOT using stdcmap for images, free stdcmap */
if (colorMapMode != CM_STDCMAP) {
int j;
for (j=0; j<stdnfcols; j++)
xvFreeColors(theDisp, theCmap, &stdfreecols[j], 1, 0L);
xv-jumbo-20070520-makefile.patch:
--- NEW FILE xv-jumbo-20070520-makefile.patch ---
diff -NarU5 xv-3.10a.orig/Makefile xv-3.10a/Makefile
--- xv-3.10a.orig/Makefile 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile 2007-12-14 22:36:46.000000000 -0500
@@ -16,11 +16,11 @@
# -Wstrict-prototypes -Waggregate-return -Wconversion \
# -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
# -Wuninitialized -Wparentheses
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
#
# these are the usual optimization and warning options for gcc; all such
# warnings but one (mktemp() use) have been eliminated (at least on Linux):
#CCOPTS = -O3 -Wall
#
@@ -54,11 +54,11 @@
### Installation locations
### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
### string concatenation, such as "fub" "ar" => "fubar")
should update
### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1
MANSUF = 1
DOCDIR = $(PREFIX)/share/doc/xv
LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
### to compile on your machine, *COMMENT OUT* the following lines
###
JP2K = -DDOJP2K
###
#JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
###
#JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
###
### if, for whatever reason, you're unable to get the PDS/VICAR support
### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
$(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
$(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
#
- $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
- chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+# $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
+# cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+# chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+# $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
#
#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
diff -NarU5 xv-3.10a.orig/Makefile.std xv-3.10a/Makefile.std
--- xv-3.10a.orig/Makefile.std 2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile.std 2007-12-14 22:34:22.000000000 -0500
@@ -16,11 +16,11 @@
# -Wstrict-prototypes -Waggregate-return -Wconversion \
# -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
# -Wuninitialized -Wparentheses
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
#
# these are the usual optimization and warning options for gcc; all such
# warnings but one (mktemp() use) have been eliminated (at least on Linux):
#CCOPTS = -O3 -Wall
#
@@ -54,11 +54,11 @@
### Installation locations
### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
### string concatenation, such as "fub" "ar" => "fubar")
should update
### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
BINDIR = $(PREFIX)/bin
MANDIR = $(PREFIX)/share/man/man1
MANSUF = 1
DOCDIR = $(PREFIX)/share/doc/xv
LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
### to compile on your machine, *COMMENT OUT* the following lines
###
JP2K = -DDOJP2K
###
#JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
###
#JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
###
### if, for whatever reason, you're unable to get the PDS/VICAR support
### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
$(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
$(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
$(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
#
- $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
- cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
- chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
- $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+# $(MKDIR) $(DESTDIR)$(DOCDIR) # or $(DESTDIR)$(LIBDIR)
+# cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+# chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+# $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
#
#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
--- NEW FILE xv.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xv
GenericName=XV Image Viewer
Comment=XV Image Viewer
Exec=xv
Icon=xv
Terminal=false
Type=Application
Categories=Graphics;Utility;2DGraphics;Viewer;
--- NEW FILE xv.spec ---
%define vprog 3.10a
%define vjumbo 20070520
Name: xv
Version: %{vprog}.jumbopatch.%{vjumbo}
Release: 6%{?dist}
Summary: Interactive image display program for X
License: Shareware
Group: Applications/Multimedia
URL: http://www.trilon.com/xv/xv.html
Source0: ftp://ftp.cis.upenn.edu/pub/xv/%{name}-%{vprog}.tar.gz
Source1:
http://downloads.sourceforge.net/png-mng/%{name}-%{vprog}-jumbo-patches-%...
Source2: DISTRIBUTE.txt
Source3: %{name}.desktop
Source4: %{name}.png
Patch0: xv-jumbo-20070520-makefile.patch
Patch1: xv-jumbo-20070520-imc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libtiff-devel libpng-devel jasper-devel libXt-devel desktop-file-utils
%package doc
Summary: Documentation files for xv image viewer
Group: Documentation
%description
A shareware program for displaying, grabbing, converting,
and otherwise manipulating graphic image files
%description doc
Documentation files for xv image viewer
%prep
%setup -q -n %{name}-%{vprog}
%setup -q -T -D -b 1 -n %{name}-%{vprog}
%{__patch} -p1 < ../%{name}-%{vprog}-jumbo-fix-enh-patch-%{vjumbo}.txt
%patch0 -p1
%patch1 -p1
%{__install} -m 0644 %{SOURCE2} .
# make doc files utf8-clean:
for F in README.jumbo copyright.h; do
iconv -f iso88591 -t utf8 ${F} -o ${F}.utf8 && %{__mv} -f ${F}.utf8 ${F}
done
%build
#configure
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
desktop-file-install --vendor=livna --dir=%{buildroot}/%{_datadir}/applications
%{SOURCE3}
%{__install} -D -m 0644 %{SOURCE4}
%{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
# get rid of reduntant doc files:
%{__rm} -f docs/xvdocs.ps docs/xvtitle.ps docs/*.5 docs/*.man
%clean
%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
%doc DISTRIBUTE.txt copyright.h README README.jumbo
%{_bindir}/*
%{_mandir}/man1/*
%{_datadir}/applications/*
%{_datadir}/icons/hicolor/48x48/apps/*
%files doc
%defattr(-,root,root)
%doc BUGS CHANGELOG docs IDEAS README.pcd
%changelog
* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info -
3.10a.jumbopatch.20070520-6
- rebuild
* Fri Jan 18 2008 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-5
- fix window destroy, file dialog bugs (thanks to <Ian.Collier(a)comlab.ox.ac.uk>)
* Sun Dec 17 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-4
- added icon
* Fri Dec 14 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-3
- move utf8 cleanup to prep section
- remove redundant BuildRequires
- remove redundant manpages from doc directory
- added desktop file
- split out documentation into separate subpackage
* Wed Dec 12 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-2
- spec file cleanup
- remove redundant doc files, make the rest of them utf8-clean
* Tue Dec 11 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-1
- added DISTRIBUTE.txt - permission to distribute from John Bradley
* Sun Dec 09 2007 Gabriel Somlo <somlo at cmu.edu> 3.10a.jumbopatch.20070520-0
- initial package combining xv with Greg Roelofs' jumbo patches
- patch to adjust makefile: jasper location, prefix, and -g cflag for debuginfo
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xv/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Jul 2008 16:57:32 -0000 1.1
+++ .cvsignore 3 Aug 2008 15:20:18 -0000 1.2
@@ -0,0 +1,3 @@
+xv-3.10a-jumbo-patches-20070520.tar.gz
+xv-3.10a.tar.gz
+xv.png
Index: sources
===================================================================
RCS file: /cvs/free/rpms/xv/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Jul 2008 16:57:32 -0000 1.1
+++ sources 3 Aug 2008 15:20:18 -0000 1.2
@@ -0,0 +1,3 @@
+9fb2d0ec320498105cafeba38a588472 xv-3.10a-jumbo-patches-20070520.tar.gz
+2d4fbeec1561304362781cc8e2f7f72d xv-3.10a.tar.gz
+99d45922a3e31929a822edd6aee25bc9 xv.png
5748
days inactive
5748
days old
rpmfusion-commits@lists.rpmfusion.org
0 comments
1 participants
participants (1)
-
Thorsten Leemhuis