rpms/xdvik/devel xdvik-22.84.13-windowid.patch, NONE, 1.1 xdvik.spec, 1.15, 1.16

Jonathan G. Underwood (jgu) fedora-extras-commits at redhat.com
Sun Apr 27 23:22:03 UTC 2008 

Author: jgu

Update of /cvs/extras/rpms/xdvik/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24216

Modified Files:
	xdvik.spec 
Added Files:
	xdvik-22.84.13-windowid.patch 
Log Message:
* Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-18
- Remove extraneous -r from cp command
- Add commentary about upstream status of patches
- Re-enable _texmf_main macro
- Add patch to fix window ID detection - BZ 442445


xdvik-22.84.13-windowid.patch:

--- NEW FILE xdvik-22.84.13-windowid.patch ---
diff -up xdvik-22.84.13/texk/xdvik/x_util.c.windowid xdvik-22.84.13/texk/xdvik/x_util.c
--- xdvik-22.84.13/texk/xdvik/x_util.c.windowid	2008-04-27 22:46:10.000000000 +0100
+++ xdvik-22.84.13/texk/xdvik/x_util.c	2008-04-27 23:32:34.000000000 +0100
@@ -200,20 +200,22 @@ Window
 get_window_id(char *window_p)
 {
     Window w;
+    unsigned char *bla;
+    bla = (unsigned char *)window_p;
     
 #if !(defined(WORD64) || defined(LONG64))
     w = (*((xuint32 *) window_p));
 #else
 # if WORDS_BIGENDIAN
-    w = ((unsigned long)window_p[0] << 24) |
-	((unsigned long)window_p[1] << 16) |
-	((unsigned long)window_p[2] << 8)  |
-	(unsigned long)window_p[3];
+    w = ((unsigned long)bla[0] << 24) |
+	((unsigned long)bla[1] << 16) |
+	((unsigned long)bla[2] << 8)  |
+	(unsigned long)bla[3];
 # else
-    w = ((unsigned long)window_p[3] << 24) |
-	((unsigned long)window_p[2] << 16) |
-	((unsigned long)window_p[1] << 8)  |
-	(unsigned long)window_p[0];
+    w = ((unsigned long)bla[3] << 24) |
+	((unsigned long)bla[2] << 16) |
+	((unsigned long)bla[1] << 8)  |
+	(unsigned long)bla[0];
 # endif
 #endif
     return w;


Index: xdvik.spec
===================================================================
RCS file: /cvs/extras/rpms/xdvik/devel/xdvik.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- xdvik.spec	3 Feb 2008 22:16:58 -0000	1.15
+++ xdvik.spec	27 Apr 2008 23:21:25 -0000	1.16
@@ -1,14 +1,13 @@
 %bcond_without japanese
 %define desktop_file_utils_version 0.9
 
-# _texmf_main is currently badly defined, so hard code it for now
-#%{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
-%define _texmf_main %{_datadir}/texmf
+# Set _texmf_main - this is defined in the texlive-texmf package 
+%{!?_texmf_main: %define _texmf_main %{_datadir}/texmf}
 
 Summary:        An X viewer for DVI files
 Name:           xdvik
 Version:        22.84.13
-Release:        17%{?dist}
+Release:        18%{?dist}
 Url:            http://xdvi.sourceforge.net/
 # encodings.c is GPLv2+ and LGPL and MIT
 # read-mapfile.c tfmload.c are from dvips
@@ -43,24 +42,72 @@
 %endif
 
 Patch1:         texlive-2007-xprint.patch
+
+# Fix for navigation with a spacebar does not keep position
+# https://bugzilla.redhat.com/show_bug.cgi?id=417461
+# https://bugzilla.redhat.com/show_bug.cgi?id=168124
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875311&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch2:         xdvik-22.84.13-keepflag-scrollfix.patch
+
+# This patch is in principle no longer needed
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875325&group_id=23164&atid=377580
 Patch3:         texlive-xdvi-maxchar.patch
+
+# Fix numlock key behaviour.
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875321&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch4:         texlive-source-xdvi-numlock.patch
+
+# Fix browser open command to use xdg-open
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875309&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch5:         xdvik-22.84.13-xdgopen.patch
+
+# Fix security issues with temp file creation
+# Not yet pushed upstream
 Patch6:         xdvik-22.84.13-tempfix.patch
+
+# Fix typos in man pages.
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1833567&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch7:		xdvik-22.84.13-manpage.patch
+
+# Fix for a double Ctrl-L segfault (BZ #429429)
+# Not yet pushed upstream.
 Patch8:		xdvik-22.84.13-bad_bar.patch
 
+# Fix bug with returning window ID.
+# https://bugzilla.redhat.com/show_bug.cgi?id=442445
+# Not yet pushed upstream.
+Patch9:		xdvik-22.84.13-windowid.patch
+
 %if %{with japanese}
 # Japanese patch for xdvi from http://sourceforge.jp/projects/xdvi/
 Patch1000:      xdvik-22.84.13-j1.36.patch.gz
+
+# Patch to allow building of both xdvik and pxdvik.
+# Local to Fedora, not appropriate to push upstream.
 Patch1001:      pxdvik-22.84.13.patch
+
+# Patch to fix up some issues when using system installed libraries.
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch1002:      pxdvik-22.84.13-use-system-libs.patch
 %endif
 
 # These patches would conflict with Patch1000 and friends and so must be applied after the
 # xdvik directory has been copied to pxdvik
+
+# Patch to fix up some issues when using system installed libraries.
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875314&group_id=23164&atid=377580
+# Fixed in upstream CVS post 22.84.13
 Patch2000:      xdvik-22.84.13-use-system-libs.patch
+
+# Fix conflicting definitions of unint32_t
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1875318&group_id=23164&atid=377580
+# http://sourceforge.net/tracker/index.php?func=detail&aid=1819017&group_id=23164&atid=377583
+# Fixed in upstream CVS post 22.84.13
 Patch2001:      xdvik-22.84.13-uint32_t-fix.patch
 
 %description
@@ -78,8 +125,6 @@
 
 %patch1 -p1
 
-# Fix for navigation with a spacebar does not keep position
-# BZ #417461, 168124.
 %patch2 -p1
 
 %patch3 -p1
@@ -87,16 +132,15 @@
 %patch5 -p1 -b .xdgopen
 %patch6 -p1 -b .tempfix
 %patch7 -p0
-
-# Fix for a double Ctrl-L segfault (BZ #429429)
 %patch8 -p1
+%patch9 -p1 -b .windowid
 
 # Allow Xaw3d enabled build of xdvi
 sed -i 's|/Xaw/|/Xaw3d/|' texk/xdvik/gui/*.[ch] texk/xdvik/*.[ch]
 
 %if %{with japanese}
 # set up Japanese xdvi in its own directory
-cp -ar texk/xdvik texk/xdvik-orig
+cp -a texk/xdvik texk/xdvik-orig
 
 # This is the Japanese xdvi patch
 %patch1000 -p1
@@ -269,6 +313,12 @@
 %endif
 
 %changelog
+* Sun Apr 28  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-18
+- Remove extraneous -r from cp command
+- Add commentary about upstream status of patches
+- Re-enable _texmf_main macro
+- Add patch to fix window ID detection - BZ 442445
+
 * Sun Feb  3  2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 22.84.13-17
 - Fix spec file typo

More information about the fedora-extras-commits mailing list