openSUSE Commits
Threads by month
- ----- 2024 -----
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
November 2010
- 1 participants
- 1023 discussions
Hello community,
here is the log from the commit of package xfce4-power-manager for openSUSE:Factory
checked in at Mon Nov 22 12:58:35 CET 2010.
--------
--- xfce4-power-manager/xfce4-power-manager.changes 2010-07-26 09:39:53.000000000 +0200
+++ /mounts/work_src_done/STABLE/xfce4-power-manager/xfce4-power-manager.changes 2010-11-21 10:10:34.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Sep 7 10:16:38 UTC 2010 - andrea(a)opensuse.org
+
+- new upstream version 1.0.1
+ * no additional changelog provided upstream
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xfce4-power-manager-0.9.98.tar.bz2
New:
----
xfce4-power-manager-1.0.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xfce4-power-manager.spec ++++++
--- /var/tmp/diff_new_pack.OQ7AAR/_old 2010-11-22 12:57:56.000000000 +0100
+++ /var/tmp/diff_new_pack.OQ7AAR/_new 2010-11-22 12:57:56.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package xfce4-power-manager (Version 0.9.98)
+# spec file for package xfce4-power-manager (Version 1.0.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,7 +19,7 @@
Name: xfce4-power-manager
-Version: 0.9.98
+Version: 1.0.1
Release: 1
Url: http://goodies.xfce.org/projects/applications/xfce4-power-manager/
License: GPLv2+
++++++ xfce4-power-manager-0.9.98.tar.bz2 -> xfce4-power-manager-1.0.1.tar.bz2 ++++++
++++ 16274 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package installation-images for openSUSE:Factory
checked in at Mon Nov 22 12:57:41 CET 2010.
--------
--- installation-images/installation-images.changes 2010-11-18 12:02:34.000000000 +0100
+++ /mounts/work_src_done/STABLE/installation-images/installation-images.changes 2010-11-22 12:23:09.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Nov 22 12:22:43 CET 2010 - snwint(a)suse.de
+
+- more lib fixes
+- adjust to new kernel
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
installation-images-12.67.tar.bz2
needed_space_in_mb
new.patch
New:
----
installation-images-12.68.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ installation-images.spec ++++++
--- /var/tmp/diff_new_pack.eysszP/_old 2010-11-22 12:56:49.000000000 +0100
+++ /var/tmp/diff_new_pack.eysszP/_new 2010-11-22 12:56:49.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package installation-images (Version 12.67)
+# spec file for package installation-images (Version 12.68)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -106,10 +106,9 @@
Obsoletes: y2image
AutoReqProv: off
Summary: Installation Image Files
-Version: 12.67
-Release: 3
-Source: installation-images-12.67.tar.bz2
-Patch0: new.patch
+Version: 12.68
+Release: 1
+Source: installation-images-12.68.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _binary_payload w.ufdio
@@ -179,7 +178,6 @@
%prep
%setup
-%patch0 -p1
rm -f /usr/lib/build/checks/04-check-filelist
%build
++++++ installation-images-12.67.tar.bz2 -> installation-images-12.68.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/VERSION new/installation-images-12.68/VERSION
--- old/installation-images-12.67/VERSION 2010-10-21 15:08:00.000000000 +0200
+++ new/installation-images-12.68/VERSION 2010-11-22 12:22:34.000000000 +0100
@@ -1 +1 @@
-12.67
+12.68
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/changelog new/installation-images-12.68/changelog
--- old/installation-images-12.67/changelog 2010-10-21 15:08:03.000000000 +0200
+++ new/installation-images-12.68/changelog 2010-11-22 12:22:37.000000000 +0100
@@ -1,4 +1,9 @@
-2010-10-21: HEAD
+2010-11-22: HEAD
+ - more lib fixes
+ - adjust to new kernel
+ - new liblzma
+
+2010-10-21: 12.67
- adjust to package changes
2010-10-04: 12.66
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/data/base/base.file_list new/installation-images-12.68/data/base/base.file_list
--- old/installation-images-12.67/data/base/base.file_list 2010-10-21 15:07:25.000000000 +0200
+++ new/installation-images-12.68/data/base/base.file_list 2010-11-22 12:13:07.000000000 +0100
@@ -265,15 +265,13 @@
/{etc,lib*,sbin}
libaudit*:
- /lib*/libaudit.so.*
+ /
libldap-2_4-2:
- /usr/lib*/liblber-*.so.*
- /usr/lib*/libldap-*.so.*
+ /
libopenssl*:
- /lib*/libcrypto.so.*
- /lib*/libssl.so.*
+ /
cyrus-sasl:
/usr/lib*/libsasl2.so.*
@@ -287,9 +285,9 @@
/usr/lib*
libxcrypt:
- /lib*
+ /
-libcrack2:
+libcrack*:
/
cracklib:
@@ -304,21 +302,21 @@
/bin/mount
/bin/umount
-libblkid1:
- /lib*
+libblkid*:
+ /
-libuuid1:
- /lib*
+libuuid*:
+ /
fribidi:
/usr/bin/fribidi
/usr/lib*/libfribidi.so.*
-liblzma0:
- /lib*/liblzma.so.*
+liblzma*:
+ /
-libcap2:
- /lib*/libcap.so.*
+libcap*:
+ /
squashfs:
/usr/bin/mksquashfs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/data/initrd/initrd.file_list new/installation-images-12.68/data/initrd/initrd.file_list
--- old/installation-images-12.67/data/initrd/initrd.file_list 2010-10-21 15:07:25.000000000 +0200
+++ new/installation-images-12.68/data/initrd/initrd.file_list 2010-11-22 12:14:01.000000000 +0100
@@ -381,23 +381,23 @@
/usr/lib*/librpm{,io}.so.*
/usr/lib/rpm/rpmrc
-liblzma0:
- /lib*/liblzma.so.*
+liblzma*:
+ /
-libpopt0:
+libpopt*:
/lib*
-libelf1:
+libelf*:
/
-liblua5_1:
+liblua5_*:
/
squashfs:
/usr/bin/mksquashfs
-libcap2:
- /lib*
+libcap*:
+ /
strace:
/usr/bin/strace
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/data/rescue/rescue.file_list new/installation-images-12.68/data/rescue/rescue.file_list
--- old/installation-images-12.67/data/rescue/rescue.file_list 2010-10-21 15:07:25.000000000 +0200
+++ new/installation-images-12.68/data/rescue/rescue.file_list 2010-11-22 12:14:21.000000000 +0100
@@ -385,16 +385,16 @@
r /usr/lib/rpm/rpm{get,put}text
r /usr/bin/rpmqpack
-liblzma0:
- /lib*/liblzma.so.*
+liblzma*:
+ /
-libelf1:
+libelf*:
/
-liblua5_1:
+liblua5_*:
/
-libsepol1:
+libsepol*:
/
setserial:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/data/root/root.file_list new/installation-images-12.68/data/root/root.file_list
--- old/installation-images-12.67/data/root/root.file_list 2010-10-21 15:07:25.000000000 +0200
+++ new/installation-images-12.68/data/root/root.file_list 2010-11-22 12:15:13.000000000 +0100
@@ -709,8 +709,8 @@
bzip2:
/usr/bin/b{,un}zip2
-libbz2-1:
- /lib*/libbz2.so*
+libbz2-*:
+ /
unzip:
/usr/bin/unzip
@@ -731,8 +731,8 @@
xz:
/usr/bin/xzdec
-liblzma0:
- /lib*/liblzma.so.*
+liblzma*:
+ /
iproute2:
/sbin/ip
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/installation-images-12.67/etc/module.config new/installation-images-12.68/etc/module.config
--- old/installation-images-12.67/etc/module.config 2010-10-21 15:07:25.000000000 +0200
+++ new/installation-images-12.68/etc/module.config 2010-11-22 11:57:47.000000000 +0100
@@ -228,6 +228,7 @@
rtc-pcf2123,-,-
rtc-ds3232,-,-
rtc-isl12022,-,-
+rtc-wm831x,-,-
ab3100-core,-,-
virtio_balloon,-,-
virtio_pci,-,-,,virtio_blk virtio_net virtio_balloon
@@ -345,6 +346,7 @@
fb_sys_fops
adp8860_bl
s6e63m0
+rbd,-,-
; acpi
@@ -387,6 +389,8 @@
einj
ghes
hed
+ec_sys
+wm831x_bl
; cpufreq (only new machines require power management)
@@ -683,11 +687,15 @@
mtdblock
libahci
ahci_platform
+cxgb4i
+libcxgbi
[network]
MoreModules=net-modules
+pch_gbe,OKI semiconductor PCH Gigabit Ethernet
+bna,Brocade 10G PCIe Ethernet
qlcnic,"QLogic 10 GbE Converged Ethernet"
ksz884x,"KSZ8841/2 PCI network"
atl1c,"Atheros 1000M Ethernet"
@@ -856,6 +864,9 @@
mcp251x,Microchip 251x CAN
cxgb4vf
janz-ican3
+pch_can
+bcm63xx
+stmmac
[WLAN]
@@ -971,6 +982,7 @@
rt2800usb,Ralink RT2800 USB Wireless LAN
rt2800lib,,-
wl12xx
+carl9170
[PCMCIA]
@@ -1068,8 +1080,9 @@
hid-roccat-kone
hid-roccat
hid-zydacron
-
-
+hid-roccat-pyra
+hid-uclogic
+hid-waltop
ff-memless
usb-storage,"USB Mass Storage Device Driver"
ub,"Low Performance USB Storage Driver"
@@ -1144,6 +1157,10 @@
usb_wwan
ssu100
zio
+ushc
+uas
+sam-ba
+cx82310_eth
[FireWire]
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package resource-agents for openSUSE:Factory
checked in at Mon Nov 22 12:56:36 CET 2010.
--------
--- resource-agents/resource-agents.changes 2010-06-25 04:14:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/resource-agents/resource-agents.changes 2010-11-20 18:08:04.000000000 +0100
@@ -1,0 +2,43 @@
+Sat Nov 20 17:07:43 UTC 2010 - coolo(a)novell.com
+
+- build against libnet-devel on 11.4
+
+-------------------------------------------------------------------
+Mon Aug 9 19:52:45 UTC 2010 - lmb(a)novell.com
+
+- mysql: replace the deprecated -O option (bnc#620275)
+- mysql: use replication credentials to test the replication status
+- ldirectord: Oracle compatibility
+- ldirectord: allow underscore in service name
+- ocf-shellfuncs: handle properly syslog facility set to none
+ (bnc#621818)
+- ocf-tester: show output from the agent in case of error
+- IPv6addr: interface index in /proc/net/if_inet6 may be longer than 2
+ chars (lf#2462)
+- Patch for bnc#623788 is now in mainline.
+- Upstream version cs d206bc8f1303
+
+-------------------------------------------------------------------
+Mon Jul 26 11:48:33 UTC 2010 - tserong(a)novell.com
+
+- CTDB: Deprecate (and make optional) smb_private_dir param (bnc#623788)
+
+-------------------------------------------------------------------
+Tue Jul 6 08:48:43 UTC 2010 - lmb(a)novell.com
+
+- ldirectord: use $1 instead of \1 in pattern replace (bnc#605086)
+- VirtualDomain: Fix spurious stop failures
+- RA: mysql: Numerous fixes.
+- Raid1: Handle stop for failed arrays properly (bnc#618775)
+- Raid1: Support attempting to re-add mirrors on deep monitor action
+ (bnc#619121)
+- sfex: wait in the start and stop actions until sfex_daemon
+ starts/exits
+- db2: support for v9.x instances (bnc#608952)
+- ocf-shellfuncs: correctly identify root by id only (bnc#602312)
+- ocf-tester: meta-data also should never be affected by missing
+ binaries.
+- ocf-tester: Extend to cover initial probe (monitor_0) test.
+- Upstream version cs 9475e2f5d8db
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ resource-agents.spec ++++++
--- /var/tmp/diff_new_pack.j4r90T/_old 2010-11-22 12:55:39.000000000 +0100
+++ /var/tmp/diff_new_pack.j4r90T/_new 2010-11-22 12:55:39.000000000 +0100
@@ -39,7 +39,7 @@
Name: resource-agents
Summary: The Heartbeat Subsystem for High-Availability Linux
Version: 1.0.3
-Release: 1
+Release: 4
License: GPLv2 ; LGPLv2.1+
Url: http://linux-ha.org/
Group: Productivity/Clustering/HA
@@ -53,7 +53,12 @@
Conflicts: heartbeat-resources
BuildRequires: autoconf automake glib2-devel pkgconfig python-devel
%if 0%{?suse_version}
-BuildRequires: libglue-devel libnet
+BuildRequires: libglue-devel
+%if %suse_version > 1130
+BuildRequires: libnet-devel
+%else
+BuildRequires: libnet
+%endif
BuildRequires: docbook-xsl-stylesheets docbook_4 libxslt
%endif
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
++++++ resource-agents.tar.bz2 ++++++
++++ 3529 lines of diff (skipped)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package syslog-ng for openSUSE:Factory
checked in at Mon Nov 22 12:56:12 CET 2010.
--------
--- syslog-ng/syslog-ng.changes 2010-08-05 20:50:42.000000000 +0200
+++ /mounts/work_src_done/STABLE/syslog-ng/syslog-ng.changes 2010-11-21 17:16:01.000000000 +0100
@@ -1,0 +2,10 @@
+Sun Nov 21 16:15:43 UTC 2010 - coolo(a)novell.com
+
+- build against the dynamic glib in /lib on 11.4 to fix build
+
+-------------------------------------------------------------------
+Sun Nov 21 13:19:42 UTC 2010 - coolo(a)novell.com
+
+- build against libnet-devel on 11.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ syslog-ng.spec ++++++
--- /var/tmp/diff_new_pack.WlcQgR/_old 2010-11-22 12:55:39.000000000 +0100
+++ /var/tmp/diff_new_pack.WlcQgR/_new 2010-11-22 12:55:39.000000000 +0100
@@ -21,14 +21,13 @@
Name: syslog-ng
%define eventlog_version 0.2.7
Version: 3.1.2
-Release: 1
+Release: 2
License: GPLv2
Group: System/Daemons
Summary: The new-generation syslog-daemon
Url: http://www.balabit.com/products/syslog_ng/
-PreReq: %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog
+Requires(pre): %insserv_prereq %fillup_prereq /sbin/klogd /etc/init.d/syslog
Provides: syslog
-AutoReqProv: on
#Source0: http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/…
Source0: syslog-ng_%{version}.tar.bz2
Source1: syslog-ng.rc-script
@@ -37,31 +36,23 @@
Patch0: syslog-ng-%{version}-less-static.dif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison flex gcc-c++ glib2-devel pkgconfig
-BuildRequires: klogd libnet python tcpd-devel
+BuildRequires: klogd python tcpd-devel
BuildRequires: libevtlog-devel pcre-devel
+%if 0%{?suse_version} > 1130
+BuildRequires: libnet-devel
+%else
+BuildRequires: libnet
+%endif
%description
syslog-ng is a "new-generation" syslogd (replacement) for Unix and
Unix-like systems. It tries to fill the gaps in the original syslogd:
* powerful configurability
-
* filtering based on message content
-
* portability
-
* better network forwarding
-The official home page of syslog-ng is:
-http://www.balabit.com/network-security/syslog-ng/
-
-
-
-Authors:
---------
- Balázs Scheidler <bazsi(a)balabit.hu>
- BalaBit IT Ltd. <info(a)balabit.hu>
-
%prep
%setup -q -n syslog-ng-%{version}
%patch0 -p0
@@ -98,13 +89,17 @@
%if 0%{?suse_version}
--enable-pcre \
%endif
+%if 0%{?suse_version} > 1130
+ --enable-dynamic-linking \
+%else
+ --enable-mixed-linking \
+%endif
%if 0%{?sles_version}
--disable-pcre \
%endif
--with-pidfile-dir=/var/run \
--sysconfdir=/etc/syslog-ng \
--localstatedir=/var/lib/syslog-ng \
- --enable-mixed-linking \
--disable-ssl
#
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package qt3 for openSUSE:Factory
checked in at Mon Nov 22 12:55:20 CET 2010.
--------
--- KDE/qt3/qt3-devel-doc.changes 2010-11-01 11:09:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2010-11-20 02:26:39.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 20 02:26:08 CET 2010 - dmueller(a)suse.de
+
+- fix build against gcc 4.6
+
+-------------------------------------------------------------------
qt3-extensions.changes: same change
qt3.changes: same change
calling whatdependson for head-i586
New:
----
gcc46.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.zYd3RN/_old 2010-11-22 12:51:32.000000000 +0100
+++ /var/tmp/diff_new_pack.zYd3RN/_new 2010-11-22 12:51:32.000000000 +0100
@@ -31,7 +31,7 @@
Summary: Documentation for the Qt 3 Development Kit
Group: Documentation/HTML
Version: 3.3.8b
-Release: 107
+Release: 108
PreReq: /bin/grep
BuildArch: noarch
Provides: qt3-devel-tutorial
@@ -111,6 +111,7 @@
Patch136: qt3-no-date.diff
Patch137: popen-leak-fix.diff
Patch138: qt3-libpng14.diff
+Patch139: gcc46.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -192,6 +193,7 @@
%if %suse_version > 1120
%patch138 -p1
%endif
+%patch139
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
++++++ qt3-extensions.spec ++++++
--- /var/tmp/diff_new_pack.zYd3RN/_old 2010-11-22 12:51:32.000000000 +0100
+++ /var/tmp/diff_new_pack.zYd3RN/_new 2010-11-22 12:51:32.000000000 +0100
@@ -25,7 +25,7 @@
%endif
License: GPL, QPL
Version: 3.3.8b
-Release: 107
+Release: 108
AutoReqProv: on
Requires: qt3 = %version
Group: Development/Tools/Other
@@ -104,6 +104,7 @@
Patch136: qt3-no-date.diff
Patch137: popen-leak-fix.diff
Patch138: qt3-libpng14.diff
+Patch139: gcc46.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -181,6 +182,7 @@
%if %suse_version > 1120
%patch138 -p1
%endif
+%patch139
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.zYd3RN/_old 2010-11-22 12:51:32.000000000 +0100
+++ /var/tmp/diff_new_pack.zYd3RN/_new 2010-11-22 12:51:32.000000000 +0100
@@ -37,7 +37,7 @@
#
Summary: A library for developing applications with graphical user interfaces
Version: 3.3.8b
-Release: 107
+Release: 108
Provides: qt_library_%version
Recommends: kdelibs3-default-style
PreReq: /bin/grep
@@ -114,6 +114,7 @@
Patch136: qt3-no-date.diff
Patch137: popen-leak-fix.diff
Patch138: qt3-libpng14.diff
+Patch139: gcc46.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -197,6 +198,7 @@
%if %suse_version > 1120
%patch138 -p1
%endif
+%patch139
# copy qt kde integration files
cp %SOURCE100 %SOURCE101 src/kernel/
cp %SOURCE101 include/private/
++++++ gcc46.diff ++++++
--- src/tools/qvaluelist.h
+++ src/tools/qvaluelist.h
@@ -50,6 +50,7 @@
#ifndef QT_NO_STL
#include <iterator>
#include <list>
+#include <cstddef>
#endif
//#define QT_CHECK_VALUELIST_RANGE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package texlive-bin for openSUSE:Factory
checked in at Mon Nov 22 12:50:45 CET 2010.
--------
--- texlive-bin/texlive-bin.changes 2010-08-11 09:22:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/texlive-bin/texlive-bin.changes 2010-11-18 14:02:36.000000000 +0100
@@ -1,0 +2,51 @@
+Thu Nov 18 14:00:50 CET 2010 - werner(a)suse.de
+
+- Check permsissions, add shebang lines
+
+-------------------------------------------------------------------
+Thu Nov 18 08:56:43 CET 2010 - werner(a)suse.de
+
+- Do not stumble across older versions or releases of TeXLive
+
+-------------------------------------------------------------------
+Wed Nov 17 10:20:42 CET 2010 - werner(a)suse.de
+
+- Split off fontconfig for type1 fonts to avoid slow down of
+ programs like Inkscape and do NOT enable them by default
+ (bnc#635446, bnc#635005, and bnc#613136)
+
+-------------------------------------------------------------------
+Tue Nov 16 14:36:48 CET 2010 - werner(a)suse.de
+
+- Update to TeXLive 2010
+ * Default version for PDF output is 1.5, enabling more compression.
+ * pdf(La)TeX now automatically converts a requested EPS file to PDF
+ * Support of execution of a very few external commands from TeX,
+ via the \write18 feature, is now enabled by default. These are
+ commands are repstopdf, makeindex, kpsewhich, bibtex, and bibtex8
+ * BibTeX and Makeindex now refuse to write their output files to an
+ arbitrary directory (like TeX itself), by default.
+ * XeTEX now supports margin kerning along the same lines as pdfTEX.
+ * New programs included:
+ - pTEX engine and related utilities for typesetting Japanese
+ - BibTeXU program for Unicode-enabled BibTeX
+ - chktex utility for checking (La)TeX documents
+ - dvisvgm (http://dvisvgm.sourceforge.net) DVI-to-SVG translator
+- Move fontconfig files to texlive-xetex (bnc#635446)
+
+-------------------------------------------------------------------
+Thu Nov 11 13:53:12 CET 2010 - werner(a)suse.de
+
+- Make sure that asymptote is fully installed (reported by Cristian
+ Morales)
+
+-------------------------------------------------------------------
+Fri Oct 29 15:42:27 CEST 2010 - werner(a)suse.de
+
+- Do not use link trigger scripts anymore (bnc#608636)
+- Avoid build date as version extension of luatex, use mod time
+ of Changelog of luatex instead.
+- Add nobody C proggy to avoid trouble with pam and su (bnc#626517)
+- Install fontconfig file to /etc/fonts/conf.avail (bnc#635446)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
source-detex.dif
source-fmtutil.dif
source-gcc44.dif
source-libpng14.patch
source-metapost.dif
texlive-20091107-extra.tar.xz
texlive-20091107-source.tar.xz
texlive-20091107-texmf.tar.xz
texmf-geometry.dif.bz2
New:
----
fc-t1-texlive.conf
nobody.8
nobody.c
texlive-20100722-source.tar.xz
texlive-20100722-texmf.tar.xz
texlive-20100826-extra.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-bin.spec ++++++
++++ 777 lines (skipped)
++++ between texlive-bin/texlive-bin.spec
++++ and /mounts/work_src_done/STABLE/texlive-bin/texlive-bin.spec
++++++ README.import ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:35.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:35.000000000 +0100
@@ -21,6 +21,14 @@
killall -HUP rpc.mountd rpc.nfsd
+* If other an architecture for the binaries are required on the client
+ side as installed on the server, those can be installed by using e.g.
+
+ rpm --excludepath=/usr/bin --ignorearch --nodeps --force \
+ -Uhv texlive-bin-2009-12.11.x86_64.rpm
+
+ on e.g. i686 based NFS server.
+
* Third (of all of the clients): Run the following command:
texlive-import your.texlive.server.here
++++++ do.mklists ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:35.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:35.000000000 +0100
@@ -113,7 +113,7 @@
-e "s@^(/var/lib/texmf(|/dist|/main))/\$@%dir %attr(1755, root, root) \1@g" \
-e "s@^(/var/cache/texmf)/\$@%dir %attr(1755, root, root) \1@g" \
-e "s@^(/var/cache/texmf/fonts(|/pk|/source|/tfm))/\$@%dir %attr(1777, root, root) \1@g" \
- -e "s@^(/usr/bin/[^/]*[^\*])\*\$@%nobin %ghost \1@g" \
+ -e "s@^(/usr/bin/[^/]*[^\*])\*\$@%isbin \1@g" \
-e "s@^([^%].*)/\$@%dir \1@g" \
-e "\@^%(no|is)bin@! s@^(.*[^\*])\$@%nobin \1@g" \
-e "\@^%(no|is)bin@! s@^(.*)\*\$@%isbin \1@g"
++++++ fc-texlive.conf ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:35.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:35.000000000 +0100
@@ -3,15 +3,12 @@
<!-- ************************************************************ -->
<!-- list of font directories of TeXLive packages -->
-<!-- -->
<!-- all subdirectories of these directories are added as well -->
<!-- ************************************************************ -->
<fontconfig>
<dir>/usr/share/texmf/fonts/opentype</dir>
<dir>/usr/share/texmf/fonts/truetype</dir>
- <dir>/usr/share/texmf/fonts/type1</dir>
<dir>/usr/local/share/texmf/fonts/opentype</dir>
<dir>/usr/local/share/texmf/fonts/truetype</dir>
- <dir>/usr/local/share/texmf/fonts/type1</dir>
</fontconfig>
++++++ nobody.8 ++++++
'\" -*- coding: UTF-8 -*-
.\" Copyright (C) 2010 Werner Fink
.\"
.\" This program is free software; you can redistribute it and/or modify
.\" it under the terms of the GNU General Public License as published by
.\" the Free Software Foundation; either version 2 of the License, or
.\" (at your option) any later version.
.\"
.\" This program is distributed in the hope that it will be useful,
.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
.\" GNU General Public License for more details.
.\"
.\" You should have received a copy of the GNU General Public License
.\" along with this program; if not, write to the Free Software
.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.\"
.TH NOBODY 8 "Jul 30, 2010" "" "Linux System Administrator's Manual"
.SH NAME
nobdy \- for user root run a specific program as user nobody
.SH SYNOPSIS
.B nobdy
.RB [ ls | find | false | true ]
.SH DESCRIPTION
.B Nobody
drops its privileges if called by the user
.I root
by switching over to the user
.I nobdy
in a clean environment.
Currently the following programs are supported:
.IP \fBls\fP
\- list directory contents
.IP \fBtrue\fP
\- do nothing, successfully
.IP \fBfalse\fP
\- do nothing, unsuccessfully
.IP \fBfind\fP
\- search for files in a directory hierarchy
.SH NOTES
For the program \fBfind\fP the options
.IR -exec ,
.IR -execdir ,
.IR -ok ,
.I -okdir
are
.B not
supported.
.SH FILES
.IR /bin/ls ,
.br
.IR /bin/true ,
.br
.IR /bin/false ,
.br
.I /usr/bin/find
.SH AUTHOR
2010 Werner Fink
.SH "SEE ALSO"
.BR ls (1),
.BR find (1),
.BR su (1),
.BR sudo (8).
++++++ nobody.c ++++++
/*
* Nobody For user root run a specific program as user nobody
*
* Usage: nobody [ls|find|false|true]
*
* Copyright (C) 2010 Werner Fink
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#include <errno.h>
#include <grp.h>
#include <pwd.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <sys/types.h>
extern char **environ;
/*
* This list is used to authenticate the program running.
* It is fixed at compile time to avoid a full class of
* dangers ...
*/
static struct {
const char *prog;
const char *run;
} *lp, list[] =
{ /* prog run */
{ "ls", "/bin/ls" },
{ "true", "/bin/true" },
{ "false", "/bin/false" },
{ "find", "/usr/bin/find" },
#ifdef DEBUG
{ "id", "/usr/bin/id" },
{ "printenv", "/usr/bin/printenv" },
#endif
{ 0, 0, }};
static struct {
const char *name;
const char *value;
} *ep, envp[] =
{ { "TERM", 0 },
{ "PATH", "/bin:/usr/bin" },
{ "POSIXLY_CORRECT",0 },
{ "NLSPATH", 0 },
{ "LANG", 0 },
{ "LC_ALL", 0 },
{ "LC_CTYPE", 0 },
{ "LC_COLLATE", 0 },
{ "LC_MESSAGES", 0 },
{ "COLUMNS", 0 },
{ "TABSIZE", 0 },
{ "TIME_STYLE", 0 },
{ "LS_COLORS", 0 },
{ "LS_BLOCK_SIZE", 0 },
{ "BLOCK_SIZE", 0 },
{ "BLOCKSIZE", 0 },
{ 0, 0 }};
int main(int argc, char *argv[])
{
char *program_name;
struct passwd *pwd;
uid_t ruid = getuid();
uid_t euid = geteuid();
gid_t rgid = getgid();
if (argc > 1)
program_name = argv[1];
else
program_name = "true";
argv++;
argc--;
if (*program_name == '/') {
for (lp = list; lp->run && strcmp(program_name, lp->run ); lp++) ;
} else {
for (lp = list; lp->prog && strcmp(program_name, lp->prog); lp++) ;
}
if (!lp->prog) {
errno = EBADRQC;
fprintf(stderr, "nobody: Usage:\n");
fprintf(stderr, " nobody [");
for (lp = list; lp->prog; lp++)
fprintf(stderr, "%s%c", lp->prog, (lp+1)->prog ? '|' : '\0');
fprintf(stderr, "]\n");
goto err;
}
if (ruid == 0 || euid == 0) {
int initgrp = 0;
if ((pwd = getpwnam("nobody")) == (struct passwd*)0)
goto err;
if (ruid == 0) {
initgrp = 1;
ruid = pwd->pw_uid;
rgid = pwd->pw_gid;
} else {
pwd->pw_uid = ruid;
pwd->pw_gid = rgid;
}
if (setregid(rgid, pwd->pw_gid))
goto err;
if (initgrp && initgroups(pwd->pw_name, rgid))
goto err;
if (setreuid(ruid, pwd->pw_uid))
goto err;
if (initgrp) {
for (ep = envp; ep->name; ep++) {
if (ep->value)
continue;
ep->value = getenv(ep->name);
}
clearenv();
if (setenv("HOME", pwd->pw_dir, 1) < 0)
goto err;
if (setenv("USER", pwd->pw_name, 1) < 0)
goto err;
if (setenv("LOGNAME", pwd->pw_name, 1) < 0)
goto err;
if (setenv("GROUP", pwd->pw_name, 1) < 0)
goto err;
if (setenv("SHELL", pwd->pw_shell, 1) < 0)
goto err;
for (ep = envp; ep->name; ep++) {
if (!ep->value)
continue;
setenv(ep->name, ep->value, 1);
}
if (strcmp(lp->prog, "find") == 0) {
int n;
for (n = 0; n < argc; n++) {
if (!argv[n] || *argv[n] == '\0')
continue;
if (strncmp(argv[n], "-exec", 5) == 0) {
errno = ENOTSUP;
goto err;
}
if (strncmp(argv[n], "-ok", 3) == 0) {
errno = ENOTSUP;
goto err;
}
}
}
}
}
execve(lp->run, argv, environ);
err:
fprintf(stderr, "nobody: ");
perror(program_name);
return 1;
}
++++++ source-64.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:35.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:35.000000000 +0100
@@ -1,6 +1,6 @@
--- configure
+++ configure 2009-08-28 15:44:29.774401466 +0000
-@@ -11734,6 +11734,10 @@ rm -f core conftest.err conftest.$ac_obj
+@@ -12505,6 +12505,10 @@ rm -f core conftest.err conftest.$ac_obj
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
++++++ source-arraysubs.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:35.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:35.000000000 +0100
@@ -1,6 +1,6 @@
--- texk/afm2pl/afm2pl.c
+++ texk/afm2pl/afm2pl.c 2009-11-11 07:45:42.783429403 +0000
-@@ -2102,7 +2102,7 @@ static void
+@@ -2107,7 +2107,7 @@ static void
readargs(int argc, char **argv)
{
register int i;
@@ -9,35 +9,9 @@
/* skip argv[0] and look at the rest. */
argv++;
---- texk/bibtex8/bibtex.h
-+++ texk/bibtex8/bibtex.h 2009-11-11 08:02:30.683429024 +0000
-@@ -956,9 +956,9 @@
- * |wiz_functions| array.
- ***************************************************************************/
- #define INSERT_FN_LOC(X) {\
-- singl_function[single_ptr] = (X);\
- if (single_ptr == SINGLE_FN_SPACE)\
- {singl_fn_overflow();}\
-+ singl_function[single_ptr] = (X);\
- INCR (single_ptr);}
-
- /***************************************************************************
---- texk/bibtexu/bibtex.h
-+++ texk/bibtexu/bibtex.h 2009-11-11 08:03:10.979429261 +0000
-@@ -956,9 +956,9 @@
- * |wiz_functions| array.
- ***************************************************************************/
- #define INSERT_FN_LOC(X) {\
-- singl_function[single_ptr] = (X);\
- if (single_ptr == SINGLE_FN_SPACE)\
- {singl_fn_overflow();}\
-+ singl_function[single_ptr] = (X);\
- INCR (single_ptr);}
-
- /***************************************************************************
--- texk/web2c/bibtex.web
+++ texk/web2c/bibtex.web 2009-11-12 11:50:51.699429941 +0000
-@@ -4305,9 +4305,9 @@ special markers |quote_next_fn| and |end
+@@ -4309,9 +4309,9 @@ special markers |quote_next_fn| and |end
|wiz_functions| array.
@d insert_fn_loc(#) == begin
@@ -48,133 +22,3 @@
incr(single_ptr);
end
---- texk/web2c/luatexdir/luafontloader/fontforge/Unicode/dump.c
-+++ texk/web2c/luatexdir/luafontloader/fontforge/Unicode/dump.c 2009-11-11 11:43:01.919429571 +0000
-@@ -339,7 +339,7 @@ static void dumpjis(FILE *output,FILE *h
- FILE *file;
- int i,j,k, first, last;
- long _orig, _unicode;
-- unichar_t unicode208[94*94], unicode212[94*94];
-+ unichar_t unicode208[96*94], unicode212[96*94];
- unichar_t *table[256], *plane;
- char buffer[400];
-
-@@ -371,7 +371,7 @@ static void dumpjis(FILE *output,FILE *h
- table[_unicode>>8][_unicode&0xff] = _orig;
- _orig -= 0x2121;
- _orig = (_orig>>8)*94 + (_orig&0xff);
-- if ( _orig>=94*94 )
-+ if ( _orig>=96*94 )
- fprintf( stderr, "Attempt to index with %ld\n", _orig );
- else {
- unicode208[_orig] = _unicode;
-@@ -413,7 +413,7 @@ static void dumpjis(FILE *output,FILE *h
- fprintf( stderr, "JIS clash at JIS212 %lx, unicode %lx\n", _orig, _unicode ); /* there are said to be a few of these, I'll just always map to 208 */
- _orig -= 0x2121;
- _orig = (_orig>>8)*94 + (_orig&0xff);
-- if ( _orig>=94*94 )
-+ if ( _orig>=96*94 )
- fprintf( stderr, "Attempt to index JIS212 with %ld\n", _orig );
- else {
- unicode212[_orig] = _unicode;
-@@ -429,7 +429,7 @@ static void dumpjis(FILE *output,FILE *h
- j=0;
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode208)/sizeof(unicode208[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode208)/sizeof(unicode208[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode208[i], unicode208[i+1], unicode208[i+2], unicode208[i+3],
- unicode208[i+4], unicode208[i+5], unicode208[i+6], unicode208[i+7]);
-@@ -439,7 +439,7 @@ static void dumpjis(FILE *output,FILE *h
- j=1;
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode212)/sizeof(unicode212[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode212)/sizeof(unicode212[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode212[i], unicode212[i+1], unicode212[i+2], unicode212[i+3],
- unicode212[i+4], unicode212[i+5], unicode212[i+6], unicode212[i+7]);
-@@ -540,7 +540,7 @@ static void dumpbig5(FILE *output,FILE *
- fprintf( header, "/* Subtract 0xa100 before indexing this array */\n" );
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode[i], unicode[i+1], unicode[i+2], unicode[i+3],
- unicode[i+4], unicode[i+5], unicode[i+6], unicode[i+7]);
-@@ -622,7 +622,7 @@ static void dumpbig5hkscs(FILE *output,F
- fprintf( header, "/* Subtract 0x8100 before indexing this array */\n" );
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode[i], unicode[i+1], unicode[i+2], unicode[i+3],
- unicode[i+4], unicode[i+5], unicode[i+6], unicode[i+7]);
-@@ -666,7 +666,7 @@ static void dumpWansung(FILE *output,FIL
- FILE *file;
- int i,j=4,k, first, last;
- long _orig, _unicode, _johab;
-- unichar_t unicode[94*94], junicode[0x7c00];
-+ unichar_t unicode[96*94], junicode[0x7c00];
- unichar_t *table[256], *plane, *jtable[256];
- char buffer[400];
- /* Johab high=[0x84-0xf9] low=[0x31-0xfe] */
-@@ -706,8 +706,8 @@ static void dumpWansung(FILE *output,FIL
- table[_unicode>>8][_unicode&0xff] = _orig;
- _orig -= 0x2121;
- _orig = (_orig>>8)*94 + (_orig&0xff);
-- if ( _orig>=94*94 ) {
-- fprintf( stderr, "Not 94x94\n" );
-+ if ( _orig>=96*94 ) {
-+ fprintf( stderr, "Not 96x94\n" );
- continue;
- }
- unicode[_orig] = _unicode;
-@@ -734,7 +734,7 @@ static void dumpWansung(FILE *output,FIL
- /* First Wansung */
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode[i], unicode[i+1], unicode[i+2], unicode[i+3],
- unicode[i+4], unicode[i+5], unicode[i+6], unicode[i+7]);
-@@ -780,7 +780,7 @@ static void dumpWansung(FILE *output,FIL
- fprintf( header, "/* Subtract 0x8400 before indexing this array */\n" );
- fprintf( header, "extern const unichar_t unicode_from_johab[];\n" );
- fprintf( output, "const unichar_t unicode_from_johab[] = {\n" );
-- for ( i=0; i<sizeof(junicode)/sizeof(junicode[0]); i+=8 )
-+ for ( i=0; i<sizeof(junicode)/sizeof(junicode[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- junicode[i], junicode[i+1], junicode[i+2], junicode[i+3],
- junicode[i+4], junicode[i+5], junicode[i+6], junicode[i+7]);
-@@ -827,7 +827,7 @@ static void dumpgb2312(FILE *output,FILE
- FILE *file;
- int i,j,k, first, last;
- long _orig, _unicode;
-- unichar_t unicode[94*94];
-+ unichar_t unicode[96*94];
- unichar_t *table[256], *plane;
- char buffer[400];
-
-@@ -870,7 +870,7 @@ static void dumpgb2312(FILE *output,FILE
-
- fprintf( header, "extern const unichar_t unicode_from_%s[];\n", cjknames[j] );
- fprintf( output, "const unichar_t unicode_from_%s[] = {\n", cjknames[j] );
-- for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]); i+=8 )
-+ for ( i=0; i<sizeof(unicode)/sizeof(unicode[0]) - 8; i+=8 )
- fprintf( output, " 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x, 0x%04x,\n",
- unicode[i], unicode[i+1], unicode[i+2], unicode[i+3],
- unicode[i+4], unicode[i+5], unicode[i+6], unicode[i+7]);
-@@ -906,7 +906,7 @@ static void dumpgb2312(FILE *output,FILE
- cjknames[j], first, last, cjknames[j], cjknames[j]);
-
- if ( first==-1 )
-- fprintf( stderr, "No 94x94\n" );
-+ fprintf( stderr, "No 96x94\n" );
- else for ( k=first; k<=last; ++k ) {
- free(table[k]);
- table[k]=NULL;
++++++ source-configure.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,20 +1,18 @@
--- configure
-+++ configure 2009-09-02 15:15:33.838402988 +0000
-@@ -23405,11 +23405,6 @@ if test "x$syslib_status" = xno; then
- $as_echo "$as_me: error: some requested system libraries failed" >&2;}
- { (exit 1); exit 1; }; }
++++ configure 2010-11-12 11:02:19.696426715 +0000
+@@ -19716,9 +19716,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ if test "x$syslib_status" = xno; then
+ as_fn_error "some requested system libraries failed" "$LINENO" 5
fi
-if test "x$syslib_used:$enable_native_texlive_build" = xyes:yes; then
-- { { $as_echo "$as_me:$LINENO: error: you can not use system libraries for a native TeX Live build" >&5
--$as_echo "$as_me: error: you can not use system libraries for a native TeX Live build" >&2;}
-- { (exit 1); exit 1; }; }
+- as_fn_error "you can not use system libraries for a native TeX Live build" "$LINENO" 5
-fi
CPPFLAGS=$kpse_save_CPPFLAGS
LIBS=$kpse_save_LIBS
--- configure.ac
-+++ configure.ac 2009-09-02 15:40:14.857901153 +0000
-@@ -104,9 +104,6 @@ KPSE_FOR_PKGS([syslib],
++++ configure.ac 2010-11-12 11:02:58.713177393 +0000
+@@ -129,9 +129,6 @@ KPSE_FOR_PKGS([sys_libs], [m4_sinclude([
if test "x$syslib_status" = xno; then
AC_MSG_ERROR([some requested system libraries failed])
fi
@@ -23,4 +21,4 @@
-fi
KPSE_RESTORE_FLAGS
- AS_IF([test "x$cross_compiling:$enable_xetex" = xyes:yes],
+ dnl AM_CONDITIONAL([build_kpathsea],
++++++ source-dvipng.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,151 +1,6 @@
-|
-| Bug fix for bnc#587794 - VUL-0: texlive dvips buffer overflow
-| covers CVE-2010-0827, CVE-2010-0829, and CVE-2010-0739
-|
---- texk/dvipng/draw.c
-+++ texk/dvipng/draw.c 2010-03-17 12:52:15.000000000 +0000
-@@ -18,7 +18,7 @@
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
-
-- Copyright (C) 2002-2008 Jan-�ke Larsson
-+ Copyright (C) 2002-2010 Jan-�ke Larsson
-
- ************************************************************************/
-
-@@ -79,9 +79,15 @@ dviunits SetChar(int32_t c)
-
- if (currentfont==NULL)
- Fatal("faulty DVI, trying to set character from null font");
--
-- if (c>=0 && c<=LASTFNTCHAR)
-- ptr = currentfont->chr[c];
-+ if (c<0 || c>LASTFNTCHAR) {
-+ Warning("glyph index out of range (%d), skipping",c);
-+ return(0);
-+ }
-+ ptr=currentfont->chr[c];
-+ if (ptr==NULL) {
-+ Warning("unable to draw glyph %d, skipping",c);
-+ return(0);
-+ }
- #ifdef DEBUG
- switch (currentfont->type) {
- case FONT_TYPE_VF: DEBUG_PRINT(DEBUG_DVI,("\n VF CHAR:\t")); break;
-@@ -90,15 +96,15 @@ dviunits SetChar(int32_t c)
- case FONT_TYPE_FT: DEBUG_PRINT(DEBUG_DVI,("\n FT CHAR:\t")); break;
- default: DEBUG_PRINT(DEBUG_DVI,("\n NO CHAR:\t"))
- }
-- if (isprint(c))
-+ if (debug & DEBUG_DVI && c>=0 && c<=UCHAR_MAX && isprint(c))
- DEBUG_PRINT(DEBUG_DVI,("'%c' ",c));
- DEBUG_PRINT(DEBUG_DVI,("%d at (%d,%d) tfmw %d", c,
- dvi_stack->hh,dvi_stack->vv,ptr?ptr->tfmw:0));
- #endif
- if (currentfont->type==FONT_TYPE_VF) {
-- return(SetVF(c));
-+ return(SetVF(ptr));
- } else {
-- if (ptr!=NULL && ptr->data == NULL)
-+ if (ptr->data == NULL)
- switch(currentfont->type) {
- case FONT_TYPE_PK: LoadPK(c, ptr); break;
- #ifdef HAVE_LIBT1
-@@ -111,8 +117,8 @@ dviunits SetChar(int32_t c)
- Fatal("undefined fonttype %d",currentfont->type);
- }
- if (page_imagep != NULL)
-- return(SetGlyph(c, dvi_stack->hh, dvi_stack->vv));
-- else if (ptr!=NULL) {
-+ return(SetGlyph(ptr, dvi_stack->hh, dvi_stack->vv));
-+ else {
- /* Expand bounding box if necessary */
- min(x_min,dvi_stack->hh - ptr->xOffset/shrinkfactor);
- min(y_min,dvi_stack->vv - ptr->yOffset/shrinkfactor);
---- texk/dvipng/dvipng.h
-+++ texk/dvipng/dvipng.h 2010-03-18 07:43:26.000000000 +0000
-@@ -18,7 +18,7 @@
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
-
-- Copyright (C) 2002-2008 Jan-�ke Larsson
-+ Copyright (C) 2002-2010 Jan-�ke Larsson
-
- ************************************************************************/
-
-@@ -387,9 +387,9 @@ void DrawPages(void);
- void WriteImage(char*, int);
- void LoadPK(int32_t, register struct char_entry *);
- int32_t SetChar(int32_t);
--dviunits SetGlyph(int32_t c, int32_t hh,int32_t vv);
-+dviunits SetGlyph(struct char_entry *ptr, int32_t hh,int32_t vv);
- void Gamma(double gamma);
--int32_t SetVF(int32_t);
-+int32_t SetVF(struct char_entry *ptr);
- int32_t SetRule(int32_t, int32_t, int32_t, int32_t);
- void SetSpecial(char *, int32_t, int32_t);
- void BeginVFMacro(struct font_entry*);
---- texk/dvipng/set.c
-+++ texk/dvipng/set.c 2010-03-17 12:52:27.000000000 +0000
-@@ -18,7 +18,7 @@
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
-
-- Copyright (C) 2002-2008 Jan-�ke Larsson
-+ Copyright (C) 2002-2010 Jan-�ke Larsson
-
- ************************************************************************/
-
-@@ -203,23 +203,13 @@ void Gamma(double gamma)
- }
- }
-
--dviunits SetGlyph(int32_t c, int32_t hh,int32_t vv)
-+dviunits SetGlyph(struct char_entry *ptr, int32_t hh,int32_t vv)
- /* gdImageChar can only do monochrome glyphs */
- {
-- register struct char_entry *ptr;
- int dst_alpha,dst_weight,tot_weight,alpha;
- int x,y,pos=0;
- int bgColor,pixelgrey,pixelcolor;
-
-- if (c<0 || c>LASTFNTCHAR) {
-- Warning("glyph index too large (%d), skipping",c);
-- return(0);
-- }
-- ptr=currentfont->chr[c];
-- if (ptr==NULL) {
-- Warning("unable to draw glyph %d, skipping",c);
-- return(0);
-- }
- hh -= ptr->xOffset/shrinkfactor;
- vv -= ptr->yOffset/shrinkfactor;
- /* Initialize persistent color cache. Perhaps this should be in
---- texk/dvipng/vf.c
-+++ texk/dvipng/vf.c 2010-04-12 14:35:53.414925428 +0000
-@@ -18,7 +18,7 @@
- License along with this program. If not, see
- <http://www.gnu.org/licenses/>.
-
-- Copyright (C) 2002-2008 Jan-�ke Larsson
-+ Copyright (C) 2002-2010 Jan-�ke Larsson
-
- ************************************************************************/
-
-@@ -27,11 +27,10 @@
- #define VF_ID 202
- #define LONG_CHAR 242
-
--int32_t SetVF(int32_t c)
-+int32_t SetVF(struct char_entry* ptr)
- {
- struct font_entry* currentvf;
- unsigned char *command,*end;
-- struct char_entry* ptr=currentfont->chr[c];
-
- currentvf=currentfont;
- BeginVFMacro(currentvf);
-@@ -116,7 +115,7 @@ void InitVF(struct font_entry * tfontp)
+--- texk/dvipng/dvipng-1.13/vf.c
++++ texk/dvipng/dvipng-1.13/vf.c 2010-04-12 14:35:53.414925428 +0000
+@@ -115,7 +115,7 @@ void InitVF(struct font_entry * tfontp)
tcharptr->tfmw = (int32_t)
((int64_t) tcharptr->tfmw * tfontp->s / (1 << 20));
DEBUG_PRINT(DEBUG_VF,(" (%d)",tcharptr->tfmw));
@@ -154,86 +9,3 @@
Fatal("VF font %s exceeds char numbering limit",tfontp->name);
tfontp->chr[c] = tcharptr;
tcharptr->data=position;
---- texk/dvipsk/dospecial.c
-+++ texk/dvipsk/dospecial.c 2010-04-29 14:30:10.000000000 +0000
-@@ -333,7 +333,11 @@ predospecial(integer numbytes, Boolean s
- int j ;
- static int omega_specials = 0;
-
-- if (nextstring + numbytes > maxstring) {
-+ if (numbytes < 0 || numbytes > maxstring - nextstring) {
-+ if (numbytes < 0 || numbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in predospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * numbytes) ;
- maxstring = nextstring + 2 * numbytes + 700 ;
- }
-@@ -918,7 +922,11 @@ bbdospecial(int nbytes)
- char seen[NKEYS] ;
- float valseen[NKEYS] ;
-
-- if (nextstring + nbytes > maxstring) {
-+ if (nbytes < 0 || nbytes > maxstring - nextstring) {
-+ if (nbytes < 0 || nbytes > (INT_MAX - 1000) / 2 ) {
-+ error("! Integer overflow in bbdospecial");
-+ exit(1);
-+ }
- p = nextstring = mymalloc(1000 + 2 * nbytes) ;
- maxstring = nextstring + 2 * nbytes + 700 ;
- }
---- texk/dvipsk/virtualfont.c
-+++ texk/dvipsk/virtualfont.c 2010-04-12 14:38:15.699425323 +0000
-@@ -2,6 +2,8 @@
- * Here's the code to load a VF file into memory.
- * Any resemblance between this file and loadfont.c is purely uncoincidental.
- */
-+#include <limits.h>
-+#include <stdio.h>
- #include "dvips.h" /* The copyright notice in that file is included too! */
- #ifdef KPATHSEA
- #include <kpathsea/c-pathmx.h>
-@@ -21,7 +23,7 @@ extern quarterword *raster ;
- #ifndef KPATHSEA
- extern char *vfpath ;
- #endif
--extern char errbuf[200] ;
-+extern char errbuf[LINE_MAX] ;
- extern real conv ;
- extern real vconv ;
- extern real alpha ;
-@@ -36,11 +38,11 @@ extern Boolean noomega ;
- * Subroutine vfbyte returns the next byte.
- */
- static FILE *vffile ;
--static char name[50] ;
-+static char name[PATH_MAX] ;
- void
- badvf(char *s)
- {
-- (void)sprintf(errbuf,"! Bad VF file %s: %s",name,s) ;
-+ (void)snprintf(errbuf, sizeof(errbuf), "! Bad VF file %s: %s",name,s) ;
- error(errbuf);
- }
-
-@@ -94,9 +96,9 @@ vfopen(register fontdesctype *fd)
- d = vfpath ;
- #endif
- #ifdef MVSXA /* IBM: MVS/XA */
-- (void)sprintf(name, "vf(%s)", n) ;
-+ (void)snprintf(name, sizeof(name), "vf(%s)", n) ;
- #else
-- (void)sprintf(name, "%s.vf", n) ;
-+ (void)snprintf(name, sizeof(name), "%s.vf", n) ;
- #endif
- #ifdef KPATHSEA
- if (0 != (vffile=search(vfpath, name, READBIN)))
-@@ -212,7 +214,7 @@ virtualfont(register fontdesctype *curfn
- check_checksum (k, curfnt->checksum, curfnt->name);
- k = (integer)(alpha * (real)vfquad()) ;
- if (k > curfnt->designsize + 2 || k < curfnt->designsize - 2) {
-- (void)sprintf(errbuf,"Design size mismatch in font %s", name) ;
-+ (void)snprintf(errbuf, sizeof(errbuf), "Design size mismatch in font %s", name) ;
- error(errbuf) ;
- }
- /*
++++++ source-dviutils.dif ++++++
++++ 629 lines (skipped)
++++ between texlive-bin/source-dviutils.dif
++++ and /mounts/work_src_done/STABLE/texlive-bin/source-dviutils.dif
++++++ source-lacheck.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -6,5 +6,5 @@
#include <string.h>
+#include <unistd.h>
- #ifdef WIN32
+ #if defined(WIN32) && !defined(__MINGW32__)
#include <win32lib.h>
++++++ source-poppler.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,70 +1,56 @@
---- configure
-+++ configure 2009-09-04 10:39:18.385901882 +0000
-@@ -20687,7 +20687,8 @@ else
- fi
-
- if $PKG_CONFIG poppler --atleast-version=0.10; then
-- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-+ POPPLER_VERSION="`$PKG_CONFIG poppler --modversion`"
-+ POPPLER_VERSION='-DPOPPLER_VERSION=\"'$POPPLER_VERSION'\" -DPOPPLER_VERSION_NUM="'$(echo $POPPLER_VERSION|sed -r 's/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/(\1<<16)|(\2<<8)|(\3)/')'"'
- XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
- XPDF_LIBS=`$PKG_CONFIG poppler --libs`
- elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
---- m4/kpse-xpdf-flags.m4
-+++ m4/kpse-xpdf-flags.m4 2009-09-04 10:37:49.557901692 +0000
-@@ -33,7 +33,8 @@ AC_DEFUN([KPSE_XPDF_OPTIONS],
- AC_DEFUN([KPSE_XPDF_SYSTEM_FLAGS],
- [AC_REQUIRE([_KPSE_CHECK_PKG_CONFIG])[]dnl
- if $PKG_CONFIG poppler --atleast-version=0.10; then
-- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-+ POPPLER_VERSION="`$PKG_CONFIG poppler --modversion`"
-+ POPPLER_VERSION='-DPOPPLER_VERSION=\"'$POPPLER_VERSION'\" -DPOPPLER_VERSION_NUM="'$(echo $POPPLER_VERSION|sed -r 's/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/(\1<<16)|(\2<<8)|(\3)/')'"'
- XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
- XPDF_LIBS=`$PKG_CONFIG poppler --libs`
- elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
---- texk/web2c/configure
-+++ texk/web2c/configure 2009-09-04 11:30:45.829901924 +0000
-@@ -24171,7 +24171,8 @@ if test "${with_system_xpdf+set}" = set;
- fi
- if test "x$with_system_xpdf" = xyes; then
- if $PKG_CONFIG poppler --atleast-version=0.10; then
-- POPPLER_VERSION='-DPOPPLER_VERSION=\"'`$PKG_CONFIG poppler --modversion`'\"'
-+ POPPLER_VERSION="`$PKG_CONFIG poppler --modversion`"
-+ POPPLER_VERSION='-DPOPPLER_VERSION=\"'$POPPLER_VERSION'\" -DPOPPLER_VERSION_NUM="'$(echo $POPPLER_VERSION|sed -r 's/([[:digit:]]+)\.([[:digit:]]+)\.([[:digit:]]+)/(\1<<16)|(\2<<8)|(\3)/')'"'
- XPDF_INCLUDES="$POPPLER_VERSION `$PKG_CONFIG poppler --cflags`"
- XPDF_LIBS=`$PKG_CONFIG poppler --libs`
- elif test "x$need_xpdf:$with_system_xpdf" = 'xyes:yes'; then
---- texk/web2c/luatexdir/image/pdftoepdf.cc
-+++ texk/web2c/luatexdir/image/pdftoepdf.cc 2009-09-04 10:50:31.721901015 +0000
-@@ -24,6 +24,9 @@
- #include <stdio.h>
- #include <string.h>
- #include <ctype.h>
-+extern "C" {
-+#include <config.h>
-+}
+--- texk/web2c/xetexdir/XeTeX_ext.c
++++ texk/web2c/xetexdir/XeTeX_ext.c 2009-09-04 08:40:23.593902337 +0000
+@@ -39,15 +39,15 @@ authorization from the copyright holders
+ #include <kpathsea/config.h>
+
+ #ifdef XETEX_OTHER
+-#ifdef POPPLER_VERSION
+-#define xpdfVersion POPPLER_VERSION
+-#define xpdfString "poppler"
+-#include "poppler-config.h"
+-#else
+-#define xpdfString "xpdf"
+-#include "xpdf/config.h"
+-#endif
+-#include "png.h"
++# ifdef POPPLER_VERSION
++# define xpdfVersion POPPLER_VERSION
++# define xpdfString "poppler"
++# include <poppler-config.h>
++# else
++# define xpdfString "xpdf"
++# include "xpdf/config.h"
++# endif
++# include "png.h"
+ #endif
+
+ #include "zlib.h"
+--- texk/web2c/xetexdir/pdfimage.cpp
++++ texk/web2c/xetexdir/pdfimage.cpp 2009-09-04 08:44:54.178401384 +0000
+@@ -33,19 +33,27 @@ authorization from the copyright holders
+ #include "pdfimage.h"
+
#ifdef POPPLER_VERSION
- # define GString GooString
- # include <dirent.h>
-@@ -36,20 +39,20 @@
- # include <GString.h>
- # include <gmem.h>
- # include <gfile.h>
--# include <assert.h>
+-#include <dirent.h>
+-#include <poppler-config.h>
+-#include <goo/GooString.h>
+-#include <goo/gmem.h>
+-#include <goo/gfile.h>
+-#define GString GooString
++# include <dirent.h>
++# include <poppler-config.h>
++# include <goo/GooString.h>
++# include <goo/gmem.h>
++# include <goo/gfile.h>
++# define GString GooString
+ #else
+-#include "goo/GString.h"
++# include "goo/GString.h"
#endif
--#include "Object.h"
--#include "Stream.h"
--#include "Array.h"
--#include "Dict.h"
--#include "XRef.h"
+-
+-#include "PDFDoc.h"
-#include "Catalog.h"
--#include "Link.h"
-#include "Page.h"
--#include "GfxFont.h"
--#include "PDFDoc.h"
--#include "GlobalParams.h"
--#include "Error.h"
-+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
@@ -78,34 +64,26 @@
+#include <GlobalParams.h>
+#include <Error.h>
- #include "epdf.h"
+ #include "XeTeX_ext.h"
-@@ -666,7 +669,7 @@ static void writeEncodings()
- }
- for (r = encodingList; r != NULL; r = n) {
- n = r->next;
-- delete r->font;
-+ r->font->decRefCnt();
- delete r;
- }
- }
-@@ -720,7 +723,13 @@ read_pdf_info(image_dict * idict, intege
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-+#if !defined(POPPLER_VERSION_NUM) || (POPPLER_VERSION_NUM) < ((0<<16)|(11<<8)|(3))
- pdf_version_found = pdf_doc->doc->getPDFVersion();
+--- texk/web2c/xetexdir/xetexextra.in
++++ texk/web2c/xetexdir/xetexextra.in 2009-09-04 08:46:29.257902488 +0000
+@@ -54,7 +54,11 @@ You should have received a copy of the G
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+-#define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
++#ifdef POPPLER_VERSION
++# define BANNER "This is XeTeX using libpoppler, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#else
-+ int major = pdf_doc->doc->getPDFMajorVersion();
-+ int minor = pdf_doc->doc->getPDFMinorVersion();
-+ pdf_version_found = (float)major + ((float)minor * 0.1);
++# define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
+#endif
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted + 0.01) {
- char msg[] =
---- texk/web2c/luatexdir/utils/utils.c
-+++ texk/web2c/luatexdir/utils/utils.c 2009-09-04 08:37:27.913901096 +0000
-@@ -42,7 +42,7 @@
+ #define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
+ #define AUTHOR "Jonathan Kew"
+ #define PROGRAM_HELP XETEXHELP
+--- texk/web2c/luatexdir/utils/utils.w
++++ texk/web2c/luatexdir/utils/utils.w 2010-11-12 12:17:52.368425494 +0000
+@@ -51,7 +51,7 @@ static const char _svn_version[] =
#include "png.h"
#ifdef POPPLER_VERSION
# define xpdfString "poppler"
@@ -114,6 +92,52 @@
# define xpdfVersion POPPLER_VERSION
#else
# define xpdfString "xpdf"
+--- texk/web2c/luatexdir/image/epdf.h
++++ texk/web2c/luatexdir/image/epdf.h 2010-11-12 12:13:21.080425485 +0000
+@@ -31,6 +31,9 @@
+ # include <string.h>
+ # include <kpathsea/c-ctype.h>
+ # include <sys/stat.h>
++extern "C" {
++#include <config.h>
++}
+ # ifdef POPPLER_VERSION
+ # define GString GooString
+ # include <dirent.h>
+@@ -43,20 +46,20 @@
+ # include <GString.h>
+ # include <gmem.h>
+ # include <gfile.h>
+-# include <assert.h>
+ # endif
+-# include "Object.h"
+-# include "Stream.h"
+-# include "Array.h"
+-# include "Dict.h"
+-# include "XRef.h"
+-# include "Catalog.h"
+-# include "Link.h"
+-# include "Page.h"
+-# include "GfxFont.h"
+-# include "PDFDoc.h"
+-# include "GlobalParams.h"
+-# include "Error.h"
++# include <assert.h>
++# include <Object.h>
++# include <Stream.h>
++# include <Array.h>
++# include <Dict.h>
++# include <XRef.h>
++# include <Catalog.h>
++# include <Link.h>
++# include <Page.h>
++# include <GfxFont.h>
++# include <PDFDoc.h>
++# include <GlobalParams.h>
++# include <Error.h>
+
+ extern "C" {
+
--- texk/web2c/pdftexdir/pdftexextra.in
+++ texk/web2c/pdftexdir/pdftexextra.in 2009-09-04 08:42:10.857902597 +0000
@@ -25,7 +25,11 @@ Franklin Street, Fifth Floor, Boston, MA
@@ -130,8 +154,16 @@
#define AUTHOR NULL
#define PROGRAM_HELP PDFTEXHELP
--- texk/web2c/pdftexdir/pdftoepdf.cc
-+++ texk/web2c/pdftexdir/pdftoepdf.cc 2009-09-04 10:51:59.757901182 +0000
-@@ -24,33 +24,35 @@ Franklin Street, Fifth Floor, Boston, MA
++++ texk/web2c/pdftexdir/pdftoepdf.cc 2010-11-12 12:15:38.192425700 +0000
+@@ -22,44 +22,41 @@ Franklin Street, Fifth Floor, Boston, MA
+ conflicting with the definition for Pascal's boolean as 'int'
+ in <kpathsea/types.h>.
+ */
+-#define boolean MINGW32_boolean
+-
+ #include <stdlib.h>
+ #include <math.h>
+ #include <stddef.h>
#include <stdio.h>
#include <string.h>
#include <ctype.h>
@@ -163,6 +195,7 @@
+# include <gmem.h>
+# include <gfile.h>
#endif
+-
-#include "Object.h"
-#include "Stream.h"
-#include "Array.h"
@@ -175,45 +208,24 @@
-#include "PDFDoc.h"
-#include "GlobalParams.h"
-#include "Error.h"
+-
+-#undef boolean
+#include <assert.h>
+#include <Object.h>
+#include <Stream.h>
+#include <Array.h>
+#include <Dict.h>
+#include <XRef.h>
-+#include <Link.h>
+#include <Catalog.h>
++#include <Link.h>
+#include <Page.h>
+#include <GfxFont.h>
+#include <PDFDoc.h>
+#include <GlobalParams.h>
+#include <Error.h>
- #include "epdf.h"
-
-@@ -650,7 +652,7 @@ static void writeEncodings()
- }
- for (r = encodingList; r != 0; r = n) {
- n = r->next;
-- delete r->font;
-+ r->font->decRefCnt();
- delete r;
- }
- }
-@@ -705,7 +707,13 @@ read_pdf_info(char *image_name, char *pa
- // this works only for PDF 1.x -- but since any versions of PDF newer
- // than 1.x will not be backwards compatible to PDF 1.x, pdfTeX will
- // then have to changed drastically anyway.
-+#if !defined(POPPLER_VERSION_NUM) || (POPPLER_VERSION_NUM) < ((0<<16)|(11<<8)|(3))
- pdf_version_found = pdf_doc->doc->getPDFVersion();
-+#else
-+ int major = pdf_doc->doc->getPDFMajorVersion();
-+ int minor = pdf_doc->doc->getPDFMinorVersion();
-+ pdf_version_found = (float)major + ((float)minor * 0.1);
-+#endif
- pdf_version_wanted = 1 + (minor_pdf_version_wanted * 0.1);
- if (pdf_version_found > pdf_version_wanted) {
- char msg[] =
+ // This file is mostly C and not very much C++; it's just used to interface
+ // the functions of xpdf, which happens to be written in C++.
--- texk/web2c/pdftexdir/pdftosrc.cc
+++ texk/web2c/pdftexdir/pdftosrc.cc 2009-09-04 08:56:09.694401252 +0000
@@ -23,33 +23,35 @@ Franklin Street, Fifth Floor, Boston, MA
@@ -278,7 +290,7 @@
--- texk/web2c/pdftexdir/utils.c
+++ texk/web2c/pdftexdir/utils.c 2009-09-04 08:38:04.370467045 +0000
-@@ -44,12 +44,12 @@ Franklin Street, Fifth Floor, Boston, MA
+@@ -43,12 +43,12 @@ Franklin Street, Fifth Floor, Boston, MA
#include "ptexlib.h"
#include "png.h"
#ifdef POPPLER_VERSION
@@ -308,86 +320,3 @@
#include "ptexlib.h"
/**********************************************************************/
---- texk/web2c/xetexdir/XeTeX_ext.c
-+++ texk/web2c/xetexdir/XeTeX_ext.c 2009-09-04 08:40:23.593902337 +0000
-@@ -35,15 +35,15 @@ authorization from the copyright holders
- */
-
- #ifdef XETEX_OTHER
--#ifdef POPPLER_VERSION
--#define xpdfVersion POPPLER_VERSION
--#define xpdfString "poppler"
--#include "poppler-config.h"
--#else
--#define xpdfString "xpdf"
--#include "xpdf/config.h"
--#endif
--#include "png.h"
-+# ifdef POPPLER_VERSION
-+# define xpdfVersion POPPLER_VERSION
-+# define xpdfString "poppler"
-+# include <poppler-config.h>
-+# else
-+# define xpdfString "xpdf"
-+# include "xpdf/config.h"
-+# endif
-+# include "png.h"
- #endif
-
- #include "zlib.h"
---- texk/web2c/xetexdir/pdfimage.cpp
-+++ texk/web2c/xetexdir/pdfimage.cpp 2009-09-04 08:44:54.178401384 +0000
-@@ -33,19 +33,27 @@ authorization from the copyright holders
- #include "pdfimage.h"
-
- #ifdef POPPLER_VERSION
--#include <dirent.h>
--#include <poppler-config.h>
--#include <goo/GooString.h>
--#include <goo/gmem.h>
--#include <goo/gfile.h>
--#define GString GooString
-+# include <dirent.h>
-+# include <poppler-config.h>
-+# include <goo/GooString.h>
-+# include <goo/gmem.h>
-+# include <goo/gfile.h>
-+# define GString GooString
- #else
--#include "goo/GString.h"
-+# include "goo/GString.h"
- #endif
--
--#include "PDFDoc.h"
--#include "Catalog.h"
--#include "Page.h"
-+#include <Object.h>
-+#include <Stream.h>
-+#include <Array.h>
-+#include <Dict.h>
-+#include <XRef.h>
-+#include <Link.h>
-+#include <Catalog.h>
-+#include <Page.h>
-+#include <GfxFont.h>
-+#include <PDFDoc.h>
-+#include <GlobalParams.h>
-+#include <Error.h>
-
- #include "XeTeX_ext.h"
-
---- texk/web2c/xetexdir/xetexextra.in
-+++ texk/web2c/xetexdir/xetexextra.in 2009-09-04 08:46:29.257902488 +0000
-@@ -54,7 +54,11 @@ You should have received a copy of the G
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
-
--#define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
-+#ifdef POPPLER_VERSION
-+# define BANNER "This is XeTeX using libpoppler, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
-+#else
-+# define BANNER "This is XeTeX, Version 3.1415926-ETEX-VERSION-XETEX-VERSION"
-+#endif
- #define COPYRIGHT_HOLDER "SIL International and Jonathan Kew"
- #define AUTHOR "Jonathan Kew"
- #define PROGRAM_HELP XETEXHELP
++++++ source-texdoc.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,6 +1,6 @@
--- texk/texlive/linked_scripts/tetex/texdoctk.pl
+++ texk/texlive/linked_scripts/tetex/texdoctk.pl 2008-09-24 14:56:14.000000000 +0000
-@@ -1398,7 +1398,7 @@ sub writerc {
+@@ -1454,7 +1454,7 @@ sub writerc {
mv $myrc,"$myrc.save" if (-e $myrc);
open(MYRC,">$myrc");
print MYRC "# user's .texdocrc, generated by program\n
@@ -9,7 +9,7 @@
# can be left empty if \$TEXMFHOME is undefined
HOMEDOCPATH=$homedocpath_tmp
# general viewer behaviour (y or yes to make active)
-@@ -1561,9 +1561,9 @@ sub readrc {
+@@ -1617,9 +1617,9 @@ sub readrc {
$localdocpath="$texmflocal/$localdocpath";
}
}
@@ -21,115 +21,19 @@
chomp $texmfhome;
if (length $texmfhome) {
# if HOMEDOCPATH is not explicitly defined, it equals TEXDOCPATH
---- texk/texlive/linked_scripts/texdoc/texdoc.tlu
-+++ texk/texlive/linked_scripts/texdoc/texdoc.tlu 2009-12-22 13:24:42.415430218 +0000
-@@ -77,7 +77,7 @@ err_priority = {
- -- everything works for them (look for support_zipped in the code).
- -- If you use this feature, please let us know: if nobody uses it,
- -- we'll drop it at some point.
--support_zipped = false
-+support_zipped = true
+--- texmf/texdoc/texdoc.cnf
++++ texmf/texdoc/texdoc.cnf 2010-11-12 11:46:52.320054617 +0000
+@@ -57,8 +57,11 @@
+ # For each "ext" in zipext_list, you must define a "unzip_ext" unzipper.
+ # The unzipped data must be printed on stdout. Example:
+ #
+-# zipext_list = gz
+-# unzip_gz = gzip -d -c
++zipext_list = gz, bz2, xz, lzma
++unzip_gz = gzip -d -c
++unzip_bz2 = bzip2 -d -c
++unzip_xz = xz -d -c
++unzip_lzma = lzma -d -c
+ ### Other settings ###
- -- BEGIN function definitions (till the 'END' mark)
-@@ -612,9 +612,8 @@ function setup_config_from_defaults()
- 'dvi,dvi.gz,dvi.bz2, ps,ps.gz,ps.bz2, ,gz,bz2')
- set_config_list {
- unzip_gz = 'gzip -d -c ',
-- unzip_bz2 = 'bzip -d -c ',
-- rm_file = 'rm -f',
-- rm_dir = 'rmdir'
-+ unzip_bz2 = 'bzip2 -d -c ',
-+ rm_dir = 'rm -rf',
- }
- else
- set_config_element('ext_list', 'pdf, html, txt, dvi, ps, ')
-@@ -631,13 +630,10 @@ end
- function how_to_view (filename)
- filename = real_path(filename) -- TODO: if not filename then ...
- if support_zipped then
-- ext = string.match(filename,'.*%.(.*)$')
-- zipext = string.match(ext,'^.*%.(.*)')
-- if zipext then
-+ local basename, zipext = string.match(filename,'.*/(.*)%.(.*)$')
-+ viewext = string.match(basename,'^.*%.(.*)$')
-+ if viewext and zipext then
- unzip_command = config['unzip_'..zipext]
-- viewext = string.match(ext,'^(.*)%..*$')
-- basename_pattern = '.*/(.*%.' .. viewext .. ')'
-- basename = string.match(filename,basename_pattern)
- tmpdir = os.tmpdir("/tmp/texdoc.XXXXXX")
- unzip_commandline = unzip_command .. filename .. " > "
- .. tmpdir .. "/" .. basename
-@@ -646,9 +642,22 @@ function how_to_view (filename)
- else
- print("Error executing \n" .. unzip_commandline)
- end
-- viewer_replacement = filename .. ';' .. config.rm_file
-- .. filename .. ';' .. config.rm_dir .. tmpdir
-- end
-+ viewer_replacement = filename .. ';' .. config.rm_dir .. tmpdir
-+ else
-+ viewer_replacement = filename
-+ -- files without extension are assumed to be text
-+ viewext = string.match(filename,'.*%.(.*)$') or 'txt'
-+ end
-+ if not config['viewer_'..viewext] then
-+ err_print (": cannot determine type of file\n\t"
-+ ..filename.."Assuming text. Set the `viewer_"..viewext..
-+ "' variable in texdoc.cnf to avoid this.", "warning")
-+ viewext = 'txt'
-+ if not config['viewer_'..viewext] then
-+ err_print ("text viewer not found. This "..
-+ "should not happen, sorry. Skipping\n\t"..filename, "error")
-+ end
-+ end -- viewer for ext
- else
- viewer_replacement = filename
- -- files without extension are assumed to be text
-@@ -672,11 +681,23 @@ function try_viewing (view_command, view
- if not view_command then
- view_result = false
- else
-+ if support_zipped then
-+ local filename, trap = string.match(viewer_replacement, "^(.*)%;(.*)$")
-+ if trap and filename then
-+ viewer_replacement = filename
-+ end
-+ viewer_replacement = '"'..viewer_replacement..'"'
-+ if trap and filename then
-+ viewer_replacement = viewer_replacement..';'..trap
-+ end
-+ else
-+ viewer_replacement = '"'..viewer_replacement..'"'
-+ end
- if string.match (view_command, place_holder) then
- view_command = string.gsub(
-- view_command, place_holder, '"'..viewer_replacement..'"')
-+ view_command, place_holder, viewer_replacement)
- else
-- view_command = view_command..' "'..viewer_replacement..'"'
-+ view_command = view_command..' '..viewer_replacement
- end
- err_print(view_command, 'debug1')
- view_result = os.execute(view_command)
-@@ -692,8 +713,17 @@ end
- -- 1. extensions are ordered as in ext_list first,
- -- 2. then filenames lexicograhpicaly.
- function file_order (a, b)
-- local ext_a = string.match (a, '^.*%.(.*)$')
-- local ext_b = string.match (b, '^.*%.(.*)$')
-+ local ext_a = string.match (a, '^[^.]*%.(.*)$')
-+ local ext_b = string.match (b, '^[^.]*%.(.*)$')
-+ local tmp = string.match(ext_a,'^(.*)%..*$')
-+ local tmp = string.match(ext_a,'^(.*)%..*$')
-+ if tmp then
-+ ext_a = tmp
-+ end
-+ tmp = string.match(ext_b,'^(.*)%..*$')
-+ if tmp then
-+ ext_b = tmp
-+ end
- ext_pos_a = config.ext_list_inv[ext_a] or (config.ext_list_max+1)
- ext_pos_b = config.ext_list_inv[ext_b] or (config.ext_list_max+1)
- if ext_pos_a < ext_pos_b then
++++++ source-warns.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,17 +1,71 @@
---- libs/teckit/lib/Makefile.am
-+++ libs/teckit/lib/Makefile.am 2009-08-28 15:16:33.130401857 +0000
-@@ -10,6 +10,9 @@ AM_CFLAGS = $(AM_CPPFLAGS)
-
- lib_LTLIBRARIES = libTECkit_Compiler.la libTECkit.la
-
-+libTECkit_Compiler_la_LIBADD = @LDZLIB@
-+libTECkit_la_LIBADD = @LDZLIB@
+--- libs/icu/icu-4.4/i18n/decNumber.h
++++ libs/icu/icu-4.4/i18n/decNumber.h 2010-11-16 10:35:01.943925533 +0000
+@@ -54,26 +54,30 @@
+ /* For ICU, use one digit per byte, to make it easier to emulate the
+ * old DigitList interface on top of a decNumber
+ */
+- #define DECDPUN 1 /* DECimal Digits Per UNit [must be >0 */
++ #define DECDPUN 3 /* DECimal Digits Per UNit [must be >0 */
+ /* and <10; 3 or powers of 2 are best]. */
+
+- /* DECNUMDIGITS is the default number of digits that can be held in */
+- /* the structure. If undefined, 1 is assumed and it is assumed */
+- /* that the structure will be immediately followed by extra space, */
+- /* as required. DECNUMDIGITS is always >0. */
+- #if !defined(DECNUMDIGITS)
+- #define DECNUMDIGITS 1
+- #endif
+-
+ /* The size (integer data type) of each unit is determined by the */
+ /* number of digits it will hold. */
+ #if DECDPUN<=2
+ #define decNumberUnit uint8_t
++ #define DECNUMDIGITS 3
+ #elif DECDPUN<=4
+ #define decNumberUnit uint16_t
++ #define DECNUMDIGITS 2
+ #else
+ #define decNumberUnit uint32_t
++ #define DECNUMDIGITS 1
+ #endif
++
++ /* DECNUMDIGITS is the default number of digits that can be held in */
++ /* the structure. If undefined, 1 is assumed and it is assumed */
++ /* that the structure will be immediately followed by extra space, */
++ /* as required. DECNUMDIGITS is always >0. */
++ #if !defined(DECNUMDIGITS)
++ #define DECNUMDIGITS 1
++ #endif
+
- ## libTECkit_Compiler_la_LIBADD = @LDZLIB@
- ## libTECkit_la_LIBADD = @LDZLIB@
+ /* The number of units needed is ceil(DECNUMDIGITS/DECDPUN) */
+ #define DECNUMUNITS ((DECNUMDIGITS+DECDPUN-1)/DECDPUN)
---- libs/teckit/source/Compiler.cpp
-+++ libs/teckit/source/Compiler.cpp 2009-08-28 15:16:33.150401373 +0000
+--- libs/icu/icu-4.4/i18n/decnumstr.cpp
++++ libs/icu/icu-4.4/i18n/decnumstr.cpp 2010-11-16 10:38:14.859926653 +0000
+@@ -70,7 +70,7 @@ void DecimalNumberString::setLength(int3
+ return;
+ }
+ if (length > fLength) {
+- uprv_memset(&fText[fLength], length - fLength, 0);
++ uprv_memset(&fText[fLength], 0, length - fLength);
+ }
+ fLength = length;
+ fText[fLength] = 0;
+--- libs/icu/icu-4.4/tools/pkgdata/pkgdata.cpp
++++ libs/icu/icu-4.4/tools/pkgdata/pkgdata.cpp 2010-11-16 10:43:54.739926722 +0000
+@@ -1595,8 +1595,8 @@ static void loadLists(UPKGOptions *o, UE
+ /* #1 try the same path where pkgdata was called from. */
+ findDirname(progname, cmdBuf, 1024, &status);
+ if(U_SUCCESS(status)) {
+- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+- uprv_strncat(cmdBuf, cmd, 1024);
++ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, strlen(U_FILE_SEP_STRING));
++ uprv_strncat(cmdBuf, cmd, strlen(cmd));
+
+ if(verbose) {
+ fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
+--- libs/teckit/TECkit-2.5.1/source/Compiler.cpp
++++ libs/teckit/TECkit-2.5.1/source/Compiler.cpp 2009-08-28 15:16:33.150401373 +0000
@@ -1451,13 +1451,16 @@ Compiler::Compiler(const char* txt, UInt
if (dest != 0) {
int result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
@@ -36,17 +90,6 @@
}
else
free(dest);
---- texk/kpathsea/xputenv.c
-+++ texk/kpathsea/xputenv.c 2009-08-28 15:16:33.150401373 +0000
-@@ -87,7 +87,7 @@ kpathsea_xputenv(kpathsea kpse, const ch
- if (cur_loc == kpse->saved_count) {
- /* No old string. */
- kpse->saved_count++;
-- kpse->saved_env = XRETALLOC(kpse->saved_env, kpse->saved_count, char *);
-+ XRETALLOC(kpse->saved_env, kpse->saved_count, char *);
- } else {
- /* We owned the old string. */
- free(kpse->saved_env[cur_loc]);
--- texk/makeindexk/genind.h
+++ texk/makeindexk/genind.h 2009-08-28 15:18:03.265996790 +0000
@@ -25,6 +25,20 @@
@@ -81,7 +124,7 @@
--- texk/makeindexk/mkind.h
+++ texk/makeindexk/mkind.h 2009-08-28 15:20:12.530403291 +0000
-@@ -253,6 +253,20 @@
+@@ -244,6 +244,20 @@
#define STREQ(A, B) (strcmp(A, B) == 0)
#define STRNEQ(A, B) (strcmp(A, B) != 0)
@@ -102,7 +145,7 @@
#define MESSAGE(F) { \
if (verbose) \
fprintf(stderr, F); \
-@@ -261,8 +275,8 @@
+@@ -252,8 +266,8 @@
#define MESSAGE1(F, S) { \
if (verbose) \
@@ -113,7 +156,7 @@
}
#if USE_KPATHSEA /* kpathsea defines a different FATAL */
-@@ -280,7 +294,7 @@
+@@ -271,7 +285,7 @@
#endif
#define FATAL1(F, S) { \
@@ -225,58 +268,25 @@
#define ROUND(x) FLOOR((x) + 0.5)
---- texk/web2c/pdftexdir/utils.c
-+++ texk/web2c/pdftexdir/utils.c 2009-08-28 15:16:33.278402328 +0000
-@@ -1387,7 +1387,7 @@ int newcolorstack(integer s, integer lit
- colstacks_size += STACK_INCREMENT;
- /* If (MAX_COLORSTACKS mod STACK_INCREMENT = 0) then we don't
- need to check the case that size overruns MAX_COLORSTACKS. */
-- colstacks = xretalloc(colstacks, colstacks_size, colstack_type);
-+ xretalloc(colstacks, colstacks_size, colstack_type);
- }
- /* claim new color stack */
- colstack_num = colstacks_used++;
---- texk/web2c/luatexdir/utils/utils.c
-+++ texk/web2c/luatexdir/utils/utils.c 2010-05-18 09:15:31.186924563 +0000
-@@ -1319,8 +1319,7 @@ integer colorstackpush(int colstack_no,
- if (page_mode) {
- if (colstack->page_used == colstack->page_size) {
- colstack->page_size += STACK_INCREMENT;
-- colstack->page_stack = xretalloc(colstack->page_stack,
-- colstack->page_size, char *);
-+ xretalloc(colstack->page_stack, colstack->page_size, char *);
- }
- colstack->page_stack[colstack->page_used++] = colstack->page_current;
- str = makecstring(s);
-@@ -1332,8 +1331,7 @@ integer colorstackpush(int colstack_no,
- } else {
- if (colstack->form_used == colstack->form_size) {
- colstack->form_size += STACK_INCREMENT;
-- colstack->form_stack = xretalloc(colstack->form_stack,
-- colstack->form_size, char *);
-+ xretalloc(colstack->form_stack, colstack->form_size, char *);
- }
- colstack->form_stack[colstack->form_used++] = colstack->form_current;
- str = makecstring(s);
---- texk/web2c/pdftexdir/utils.c
-+++ texk/web2c/pdftexdir/utils.c 2010-05-18 09:14:45.210924259 +0000
-@@ -1471,8 +1471,7 @@ integer colorstackpush(int colstack_no,
+--- texk/web2c/luatexdir/pdf/pdfcolorstack.w
++++ texk/web2c/luatexdir/pdf/pdfcolorstack.w 2010-11-16 10:46:58.863925991 +0000
+@@ -207,8 +207,7 @@ static int colorstackpush(int colstack_n
if (page_mode) {
if (colstack->page_used == colstack->page_size) {
colstack->page_size += STACK_INCREMENT;
- colstack->page_stack = xretalloc(colstack->page_stack,
-- colstack->page_size, char *);
-+ xretalloc(colstack->page_stack, colstack->page_size, char *);
+- (unsigned) colstack->page_size,
++ xretalloc(colstack->page_stack, (unsigned) colstack->page_size,
+ char *);
}
colstack->page_stack[colstack->page_used++] = colstack->page_current;
- str = makecstring(s);
-@@ -1484,8 +1483,7 @@ integer colorstackpush(int colstack_no,
+@@ -222,8 +221,7 @@ static int colorstackpush(int colstack_n
} else {
if (colstack->form_used == colstack->form_size) {
colstack->form_size += STACK_INCREMENT;
- colstack->form_stack = xretalloc(colstack->form_stack,
-- colstack->form_size, char *);
-+ xretalloc(colstack->form_stack, colstack->form_size, char *);
+- (unsigned) colstack->form_size,
++ xretalloc(colstack->form_stack, (unsigned) colstack->form_size,
+ char *);
}
colstack->form_stack[colstack->form_used++] = colstack->form_current;
- str = makecstring(s);
++++++ source-xdvizilla.dif ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -1,5 +1,5 @@
--- texk/xdvik/xdvizilla
-+++ texk/xdvik/xdvizilla 2008-09-25 12:38:16.072122050 +0200
++++ texk/xdvik/xdvizilla 2008-09-25 10:38:16.072122050 +0000
@@ -89,12 +89,7 @@ trap 'do_cleanup' 1 2 3 7 13 15
### create a temporary directory only read/writable by user
### try mktemp if it's available
++++++ source.dif ++++++
++++ 1567 lines (skipped)
++++ between texlive-bin/source.dif
++++ and /mounts/work_src_done/STABLE/texlive-bin/source.dif
++++++ texlive-import ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -59,7 +59,7 @@
#
arch="$(uname -i| tr '[:upper:]' '[:lower:]' | sed s/ppc64/ppc/)"
system="$(uname -s| tr '[:upper:]' '[:lower:]')"
-binary=${arch/i386/i?86}-${system}
+binary=${arch/i586/i?86}-${system}
#
# Test the texlive system: Something is already mounted?
#
++++++ texlive-import.8 ++++++
--- /var/tmp/diff_new_pack.cXD3TV/_old 2010-11-22 12:44:36.000000000 +0100
+++ /var/tmp/diff_new_pack.cXD3TV/_new 2010-11-22 12:44:36.000000000 +0100
@@ -47,6 +47,22 @@
Use this machine binary type. Default is
.IR arch-system .
Some example: i386-linux, x86_64-linux.
+If other an architecture type for the binaries is required on the
+current client, this can be installed
+.B on
+the NF server with e.g.
+.sp 1
+.in +1c
+.nf
+rpm --excludepath=/usr/bin --ignorearch --nodeps --force -Uhv texlive-bin-*<version>.<arch>.rpm
+.fi
+.in -1c
+.sp 1
+with
+.B <version>
+the same version installed natively on the server and with
+.B <arch>
+the required architecture type of the client.
.IP
.\"
.SH EXAMPLE
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package jack for openSUSE:Factory
checked in at Mon Nov 22 12:45:51 CET 2010.
--------
--- jack/jack.changes 2010-07-07 10:12:40.000000000 +0200
+++ /mounts/work_src_done/STABLE/jack/jack.changes 2010-11-20 11:45:36.000000000 +0100
@@ -1,0 +2,35 @@
+Tue Nov 9 22:25:30 UTC 2010 - davejplater(a)gmail.com
+
+- Update to version 1.9.6
+- Upstream changes :
+ *Improve JackCoreAudioDriver and JackCoreAudioAdapter : when no
+ devices are described, takes default input and output and
+ aggregate them.
+ *Correct JackGraphManager::DeactivatePort.
+ *Correct JackMachServerChannel::Execute : keep running even in
+ error cases.
+ *Raise JACK_PROTOCOL_VERSION number. Arnold Krille firewire patch.
+ *Fix some file header to have library side code use LGPL.
+ *ffado-portname-sync.patch from ticket #163 applied.
+ *Remove call to exit in library code.
+ *Make jack_connect/jack_disconnect wait for effective port
+ connection/disconnection.
+ *Add tests to validate intclient.h API.
+ *On Linux, inter-process synchronization primitive switched to
+ POSIX semaphore.
+ *In JackCoreAudioDriver, move code called in MeasureCallback to be
+ called once in IO thread.
+ *David Garcia Garzon netone patch.
+ *Fix from Fernando Lopez-Lezcano for compilation on fc13.
+ *Fix JackPosixSemaphore::TimedWait : same behavior as
+ JackPosixSemaphore::Wait regarding EINTR.
+ *David Garcia Garzon unused_pkt_buf_field_jack2 netone patch.
+ *Arnold Krille firewire snooping patch.
+ *Jan Engelhardt patch for get_cycles on SPARC.
+ *Adrian Knoth hurd.patch, kfreebsd-fix.patch and
+ alpha_ia64-sigsegv.patch from ticket 177.
+ *Adrian Knoth fix for linux cycle.h (ticket 188).
+ *In JackCoreAudioDriver, fix an issue when no value is given for
+ input.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
jack-1.9.5.tar.bz2
manpages.tar.bz2
New:
----
jack-1.9.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ jack.spec ++++++
--- /var/tmp/diff_new_pack.qS8qup/_old 2010-11-22 12:44:11.000000000 +0100
+++ /var/tmp/diff_new_pack.qS8qup/_new 2010-11-22 12:44:11.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package jack (Version 1.9.5)
+# spec file for package jack (Version 1.9.6)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -17,23 +17,25 @@
# norootforbuild
+%if 0%{?suse_version} > 1110
+# Switch the --dbus on and off, on = 1
+%define wdbus 0
+BuildRequires: libffado-devel
+%else
+%define wdbus 0
+%endif
Name: jack
BuildRequires: dos2unix doxygen gcc-c++ libcelt-devel >= 0.7.0 libxml2-devel pkg-config python
BuildRequires: alsa-devel flac-devel libsndfile-devel pkgconfig readline-devel
BuildRequires: dbus-1-devel libFLAC8 libexpat-devel libogg-devel libsamplerate-devel
-%if 0%{?suse_version} > 1110
-BuildRequires: libffado-devel
-%endif
-%define my_provides /tmp/my-provides
Summary: Jack-Audio Connection Kit
-Version: 1.9.5
-Release: 5
+Version: 1.9.6
+Release: 1
License: LGPLv2.1+
Group: System/Sound Daemons
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
-Source2: manpages.tar.bz2
Patch1: jack-CAS.diff
Patch2: jack-sparcv9.diff
Url: http://jackaudio.org/
@@ -87,22 +89,30 @@
communicate with jack clients/servers.
%prep
-%setup -q -a 2
+%setup -q
%patch -P 1 -P 2 -p1
%build
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$CFLAGS"
-./waf \
- --prefix=/usr/ \
+./waf -v \
+ --prefix=%{_prefix} \
--libdir=/%{_lib} \
--classic \
+%if 0%{?wdbus} == 1
+ --dbus \
+%endif
+%if 0%{?suse_version} > 1110
+ --firewire \
+%endif
+ --alsa \
--doxygen \
--profile \
--ports=1024 \
--enable-pkg-config-dbus-service-dir \
--profile \
+ --mandir=/share/man/man1 \
configure
# waf only understands -j, so do not use smp_mflags
@@ -116,19 +126,11 @@
dos2unix -k README
dos2unix -k TODO
cp ChangeLog README* TODO $RPM_BUILD_ROOT%{_docdir}/%{name}/
+
# Fix wrong-file-end-of-line-encoding
dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/ChangeLog
dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/README
dos2unix -k $RPM_BUILD_ROOT%{_docdir}/%{name}/TODO
-# install man pages taken from jack-0.118.0 due to no man pages in this package
-cp -r man $RPM_BUILD_ROOT%{_datadir}
-# exclude plugins from the provide-list
-cat << EOF > %{my_provides}
-grep -v $RPM_BUILD_ROOT%{_libdir}/jack | %{__find_provides}
-EOF
-chmod 755 %{my_provides}
-%define _use_internal_dependecy_generator 0
-%define __find_provides %{my_provides}
%post -n libjack0 -p /sbin/ldconfig
@@ -136,13 +138,10 @@
%clean
test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT
-rm -f %{my_provides}
%files
%defattr(-,root,root)
%doc %dir %{_docdir}/%{name}
-#%%doc %{_docdir}/%{name}/AUTHORS
-#%%doc %{_docdir}/%{name}/COPYING.GPL
%doc %{_docdir}/%{name}/ChangeLog
%doc %{_docdir}/%{name}/README*
%doc %{_docdir}/%{name}/TODO
@@ -150,10 +149,8 @@
%{_bindir}/*
%dir %{_libdir}/jack
%{_libdir}/jack/inprocess.so
-#%%{_libdir}/jack/intime.so
%{_libdir}/jack/jack_alsa.so
%{_libdir}/jack/jack_dummy.so
-#%%{_libdir}/jack/jack_oss.so
%{_libdir}/jack/jack_net.so
%{_libdir}/jack/netmanager.so*
%{_libdir}/jack/profiler.so*
@@ -164,6 +161,9 @@
%if 0%{?suse_version} > 1110
%{_libdir}/jack/jack_firewire.so
%endif
+%if 0%{?wdbus} == 1
+%{_datadir}/dbus-1/services/org.jackaudio.service
+%endif
%files -n libjack0
%defattr(-, root, root)
@@ -172,18 +172,10 @@
%files -n libjack-devel
%defattr(-, root, root)
%doc %dir %{_docdir}/%{name}
-#%%doc %{_docdir}/%{name}/reference
-#%%doc %{_docdir}/%{name}/COPYING.LGPL
%{_libdir}/lib*.so
-#%%{_libdir}/lib*.la
-#%%{_libdir}/jack/*.*a
%{_libdir}/pkgconfig/*
%{_includedir}/jack
%dir %{_docdir}/jack-audio-connection-kit
%doc %{_docdir}/jack-audio-connection-kit/*
-#%files freebob
-#%defattr(-, root, root)
-#%{_libdir}/jack/jack_freebob.so*
-
%changelog
++++++ jack-1.9.5.tar.bz2 -> jack-1.9.6.tar.bz2 ++++++
++++ 13146 lines of diff (skipped)
++++++ jack-CAS.diff ++++++
--- /var/tmp/diff_new_pack.qS8qup/_old 2010-11-22 12:44:12.000000000 +0100
+++ /var/tmp/diff_new_pack.qS8qup/_new 2010-11-22 12:44:12.000000000 +0100
@@ -15,10 +15,10 @@
linux/JackAtomic_os.h | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
-Index: jack-1.9.5/linux/JackAtomic_os.h
+Index: jack-1.9.5.4046/linux/JackAtomic_os.h
===================================================================
---- jack-1.9.5.orig/linux/JackAtomic_os.h
-+++ jack-1.9.5/linux/JackAtomic_os.h
+--- jack-1.9.5.4046.orig/linux/JackAtomic_os.h
++++ jack-1.9.5.4046/linux/JackAtomic_os.h
@@ -48,9 +48,7 @@ static inline int CAS(register UInt32 va
return result;
}
@@ -45,4 +45,4 @@
+
#endif
- #endif
+ #if !defined(__i386__) && !defined(__x86_64__) && !defined(__PPC__)
++++++ jack-sparcv9.diff ++++++
--- /var/tmp/diff_new_pack.qS8qup/_old 2010-11-22 12:44:12.000000000 +0100
+++ /var/tmp/diff_new_pack.qS8qup/_new 2010-11-22 12:44:12.000000000 +0100
@@ -5,13 +5,13 @@
linux/cycles.h | 10 ++++++++++
1 file changed, 10 insertions(+)
-Index: jack-1.9.5/linux/cycles.h
+Index: jack-1.9.5.4046/linux/cycles.h
===================================================================
---- jack-1.9.5.orig/linux/cycles.h
-+++ jack-1.9.5/linux/cycles.h
-@@ -53,6 +53,16 @@ static inline unsigned long get_cycles(v
-
- #endif
+--- jack-1.9.5.4046.orig/linux/cycles.h
++++ jack-1.9.5.4046/linux/cycles.h
+@@ -63,6 +63,16 @@ static inline unsigned long long get_cyc
+ }
+ #endif /* __sparc_v9__ */
+#ifdef __sparc_v9__
+/* rd is V9 only */
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libs for openSUSE:Factory
checked in at Mon Nov 22 12:43:47 CET 2010.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2010-11-02 09:15:58.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2010-11-22 00:43:15.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Nov 21 23:35:35 UTC 2010 - sndirsch(a)novell.com
+
+- libXxf86misc 1.0.3
+ * This minor maintenance release provides the usual recent set
+ of misc. cleanups and build configuration improvements.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXxf86misc-1.0.2.tar.bz2
New:
----
libXxf86misc-1.0.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.FyQyuf/_old 2010-11-22 12:43:29.000000000 +0100
+++ /var/tmp/diff_new_pack.FyQyuf/_new 2010-11-22 12:43:29.000000000 +0100
@@ -34,7 +34,7 @@
#
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 11
+Release: 12
License: GPLv2+ ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -57,7 +57,7 @@
Source17: libXtst-1.2.0.tar.bz2
Source18: libXvMC-1.0.6.tar.bz2
Source19: libXxf86dga-1.1.2.tar.bz2
-Source20: libXxf86misc-1.0.2.tar.bz2
+Source20: libXxf86misc-1.0.3.tar.bz2
Source21: libXxf86vm-1.1.1.tar.bz2
Source22: libdmx-1.1.1.tar.bz2
Source23: liblbxutil-1.1.0.tar.bz2
++++++ libXxf86misc-1.0.2.tar.bz2 -> libXxf86misc-1.0.3.tar.bz2 ++++++
++++ 61703 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/ChangeLog new/libXxf86misc-1.0.3/ChangeLog
--- old/libXxf86misc-1.0.2/ChangeLog 2009-10-09 07:22:46.000000000 +0200
+++ new/libXxf86misc-1.0.3/ChangeLog 2010-11-21 22:47:27.000000000 +0100
@@ -1,3 +1,118 @@
+commit cf3d37b193895268106418e6fdb58a078abe7a3f
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 21 13:46:50 2010 -0800
+
+ libXxf86misc 1.0.3
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 16656bdbb3420c73fe6ff46a31063b509ceb89f9
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 10 20:55:45 2010 -0800
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM sttaements under the Automake initialization section.
+ Add missing AC_CONFIG_SRCDIR
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 483bdb6fb59dcc802580b8fd066263ec910c9f1d
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 10 20:53:03 2010 -0800
+
+ config: AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 37eccfb9d61170d382d84d2865940a4f8dc71e51
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 10 20:51:33 2010 -0800
+
+ config: upgrade to util-macros 1.8 for additional man page support
+
+ Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
+ The value of MAN_SUBST is the same for all X.Org packages.
+
+ Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS
+ The existing statement can now be removed from the configuration file.
+
+ Use automake provided $(AM_V_GEN) and XORG_DEFAULT_OPTIONS provided $(SED)
+ Enables silent rule and use platform appropriate version of sed.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit a1b02fe586040d85e47ac3cabdc9eb105e53fef3
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Nov 10 20:49:04 2010 -0800
+
+ config: update AC_PREREQ statement to 2.60
+
+ Unrelated to the previous patches, the new value simply reflects
+ the reality that the minimum level for autoconf to configure
+ all x.org modules is 2.60 dated June 2006.
+
+ ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit f5b0c0692d2dc8871b3b451f5ea368dceb68083e
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Wed Nov 10 20:48:43 2010 -0800
+
+ Sun's copyrights belong to Oracle now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 76002a36b305c4ae293e9681d6eef467ba881f66
+Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
+Date: Thu Jan 14 20:50:03 2010 -0800
+
+ Update Sun license notices to current X.Org standard form
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)sun.com>
+
+commit eff3aec50f80982f3d6667cdb305815198ff8097
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Fri Nov 27 20:56:04 2009 -0500
+
+ Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
+
+ Now that the INSTALL file is generated.
+ Allows running make maintainer-clean.
+
+commit ac843fca746eea5d6911f724ce04ade069a9c81a
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Wed Oct 28 14:09:10 2009 -0400
+
+ INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
+
+ Add missing INSTALL file. Use standard GNU file on building tarball
+ README may have been updated
+ Remove AUTHORS file as it is empty and no content available yet.
+ Remove NEWS file as it is empty and no content available yet.
+
+commit 21d00efc0201ec7bc25e1a9fbd74814a7e3b49dc
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Mon Oct 26 22:08:43 2009 -0400
+
+ Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
+
+ ChangeLog filename is known to Automake and requires no further
+ coding in the makefile.
+
+commit 9cf85740f2686352b6f43b16cec75aad669a25e9
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Thu Oct 22 12:34:19 2009 -0400
+
+ .gitignore: use common defaults with custom section # 24239
+
+ Using common defaults will reduce errors and maintenance.
+ Only the very small or inexistent custom section need periodic maintenance
+ when the structure of the component changes. Do not edit defaults.
+
commit 74b475b59fd0da95f91e75d5f32276e87dda6f3f
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Thu Oct 8 22:21:41 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/INSTALL new/libXxf86misc-1.0.3/INSTALL
--- old/libXxf86misc-1.0.2/INSTALL 1970-01-01 01:00:00.000000000 +0100
+++ new/libXxf86misc-1.0.3/INSTALL 2010-11-21 22:47:27.000000000 +0100
@@ -0,0 +1,291 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007, 2008 Free Software Foundation, Inc.
+
+ This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+ Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
+
+ The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation. It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions. Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+ It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring. Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+ If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release. If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+ The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+The simplest way to compile this package is:
+
+ 1. `cd' to the directory containing the package's source code and type
+ `./configure' to configure the package for your system.
+
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
+
+ 2. Type `make' to compile the package.
+
+ 3. Optionally, type `make check' to run any self-tests that come with
+ the package.
+
+ 4. Type `make install' to install the programs and any data files and
+ documentation.
+
+ 5. You can remove the program binaries and object files from the
+ source code directory by typing `make clean'. To also remove the
+ files that `configure' created (so you can compile the package for
+ a different kind of computer), type `make distclean'. There is
+ also a `make maintainer-clean' target, but that is intended mainly
+ for the package's developers. If you use it, you may have to get
+ all sorts of other programs in order to regenerate files that came
+ with the distribution.
+
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
+Compilers and Options
+=====================
+
+ Some systems require unusual options for compilation or linking that
+the `configure' script does not know about. Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+ You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment. Here
+is an example:
+
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+ *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+ You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory. To do this, you can use GNU `make'. `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script. `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+ On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor. Like
+this:
+
+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+ CPP="gcc -E" CXXCPP="g++ -E"
+
+ This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+ By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+ You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files. If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+ In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files. Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+ If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+ Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System). The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+ For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Particular systems
+==================
+
+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+ ./configure CC="cc -Ae"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
+a workaround. If GNU CC is not installed, it is therefore recommended
+to try
+
+ ./configure CC="cc"
+
+and if that doesn't work, try
+
+ ./configure CC="cc -nodtk"
+
+Specifying the System Type
+==========================
+
+ There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on. Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option. TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+ CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+ OS KERNEL-OS
+
+ See the file `config.sub' for the possible values of each field. If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+ If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+ If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+ If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists. Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+ Variables not defined in a site shell script can be set in the
+environment passed to `configure'. However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost. In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'. For example:
+
+ ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
+
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+ `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+ Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+ Print a summary of the options unique to this package's
+ `configure', and exit. The `short' variant lists options used
+ only in the top level, while the `recursive' variant lists options
+ also present in any nested packages.
+
+`--version'
+`-V'
+ Print the version of Autoconf used to generate the `configure'
+ script, and exit.
+
+`--cache-file=FILE'
+ Enable the cache: use and save the results of the tests in FILE,
+ traditionally `config.cache'. FILE defaults to `/dev/null' to
+ disable caching.
+
+`--config-cache'
+`-C'
+ Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+ Do not print messages saying which checks are being made. To
+ suppress all normal output, redirect it to `/dev/null' (any error
+ messages will still be shown).
+
+`--srcdir=DIR'
+ Look for the package's source code in directory DIR. Usually
+ `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+ Use DIR as the installation prefix. *Note Installation Names::
+ for more details, including other options available for fine-tuning
+ the installation locations.
+
+`--no-create'
+`-n'
+ Run the configure checks, but stop before creating any output
+ files.
+
+`configure' also accepts some other, not widely useful, options. Run
+`configure --help' for more details.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/Makefile.am new/libXxf86misc-1.0.3/Makefile.am
--- old/libXxf86misc-1.0.2/Makefile.am 2009-02-03 05:46:49.000000000 +0100
+++ new/libXxf86misc-1.0.3/Makefile.am 2010-11-11 05:50:20.000000000 +0100
@@ -3,12 +3,15 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xxf86misc.pc
-EXTRA_DIST = xxf86misc.pc.in ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+EXTRA_DIST = xxf86misc.pc.in
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/configure.ac new/libXxf86misc-1.0.3/configure.ac
--- old/libXxf86misc-1.0.2/configure.ac 2009-10-09 07:21:26.000000000 +0200
+++ new/libXxf86misc-1.0.3/configure.ac 2010-11-21 22:42:55.000000000 +0100
@@ -1,22 +1,26 @@
-AC_PREREQ([2.57])
+dnl Process this file with autoconf to create configure.
-AC_INIT(libXxf86misc, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86misc)
+# Initialize Autoconf
+AC_PREREQ([2.60])
+AC_INIT([libXxf86misc], [1.0.3],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [libXxf86misc])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([src/config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-
-AM_CONFIG_HEADER(src/config.h)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
-XORG_DEFAULT_OPTIONS
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XXF86MISC, xproto x11 xextproto xext xf86miscproto)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/man/Makefile.am new/libXxf86misc-1.0.3/man/Makefile.am
--- old/libXxf86misc-1.0.2/man/Makefile.am 2009-10-09 07:18:25.000000000 +0200
+++ new/libXxf86misc-1.0.3/man/Makefile.am 2010-11-11 05:51:19.000000000 +0100
@@ -1,28 +1,25 @@
#
-# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation.
-#
-# The above copyright notice and this permission notice shall be included
-# in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
-# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-# OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the copyright holders shall
-# not be used in advertising or otherwise to promote the sale, use or
-# other dealings in this Software without prior written authorization
-# from the copyright holders.
-#
+# Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
libmandir = $(LIB_MAN_DIR)
@@ -37,21 +34,9 @@
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(XF86Misc_shadowmen)
-SED = sed
-
-# Strings to replace in man pages
-XORGRELSTRING = @PACKAGE_STRING@
- XORGMANNAME = X Version 11
-
-MAN_SUBSTS = \
- -e 's/__vendorversion__/"$(XORGRELSTRING)" "$(XORGMANNAME)"/' \
- -e 's/__xconfigfile__/xorg.conf/g' \
- -e 's/__appmansuffix__/$(APP_MAN_SUFFIX)/g' \
- -e 's/__libmansuffix__/$(LIB_MAN_SUFFIX)/g' \
- -e 's/__filemansuffix__/$(FILE_MAN_SUFFIX)/g'
-
SUFFIXES = .$(LIB_MAN_SUFFIX) .man
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
.man.$(LIB_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86misc-1.0.2/src/config.h.in new/libXxf86misc-1.0.3/src/config.h.in
--- old/libXxf86misc-1.0.2/src/config.h.in 2009-10-09 07:22:24.000000000 +0200
+++ new/libXxf86misc-1.0.3/src/config.h.in 2010-11-21 22:47:10.000000000 +0100
@@ -30,6 +30,10 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
@@ -45,6 +49,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package xorg-x11-libX11 for openSUSE:Factory
checked in at Mon Nov 22 12:43:44 CET 2010.
--------
--- xorg-x11-libX11/xorg-x11-libX11.changes 2010-10-30 18:15:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2010-11-22 00:49:40.000000000 +0100
@@ -1,0 +2,7 @@
+Sun Nov 21 23:39:31 UTC 2010 - sndirsch(a)novell.com
+
+- update to release 1.4.0
+ * After 3 release candidates, it's finally done - libX11 1.4 is
+ released.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libX11-1.3.99.903.tar.bz2
New:
----
libX11-1.4.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libX11.spec ++++++
--- /var/tmp/diff_new_pack.K0r916/_old 2010-11-22 12:43:26.000000000 +0100
+++ /var/tmp/diff_new_pack.K0r916/_new 2010-11-22 12:43:26.000000000 +0100
@@ -20,7 +20,7 @@
Name: xorg-x11-libX11
%define xcb 1
-%define dirsuffix 1.3.99.903
+%define dirsuffix 1.4.0
BuildRequires: fdupes pkgconfig xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel zlib-devel
%if %xcb
BuildRequires: xorg-x11-libxcb-devel
@@ -28,7 +28,7 @@
PreReq: coreutils
Url: http://xorg.freedesktop.org/
Version: 7.5
-Release: 6
+Release: 7
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
++++++ libX11-1.3.99.903.tar.bz2 -> libX11-1.4.0.tar.bz2 ++++++
++++ 8916 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.903/ChangeLog new/libX11-1.4.0/ChangeLog
--- old/libX11-1.3.99.903/ChangeLog 2010-10-30 07:03:01.000000000 +0200
+++ new/libX11-1.4.0/ChangeLog 2010-11-21 23:17:50.000000000 +0100
@@ -1,3 +1,59 @@
+commit 24db5b5ff0d51b0ed9d9701a792c5f14f23b638d
+Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+Date: Sun Nov 21 14:04:32 2010 -0800
+
+ libX11 1.4.0
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 18d3c3e9de19e936281b111d5a82acfb3a3f552e
+Author: Dan Nicholson <dbn.lists(a)gmail.com>
+Date: Sat Nov 6 21:58:10 2010 +0000
+
+ config: Check host string when deciding architecture to build for
+
+ When checking for the OS/2 platform, $target_os is used. However, unless
+ building a cross compiler, the $host* strings contain the platform
+ details for the build system. See:
+
+ http://www.gnu.org/software/automake/manual/automake.html#Cross_002dCompila…
+
+ $host_os is already being used to determine the transport and threading
+ options.
+
+ Signed-off-by: Dan Nicholson <dbn.lists(a)gmail.com>
+ Reviewed-by: Julien Cristau <jcristau(a)debian.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit affc2488a7f2660a74dc8354fc3e0bff2c4f879c
+Author: Dan Nicholson <dbn.lists(a)gmail.com>
+Date: Sat Nov 6 21:58:09 2010 +0000
+
+ config: Fix architecture check for OS/2 to skip nios2 cpu
+
+ The OS/2 platform requires some utility functions as well as having a
+ non-32 bit wchar_t. Fix the configure check so that it doesn't also
+ affect the nios2 cpu, which wouldn't influence these operating system
+ issues.
+
+ Signed-off-by: Dan Nicholson <dbn.lists(a)gmail.com>
+ Tested-by: Frans Meulenbroeks <fransmeulenbroeks(a)gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+ Reviewed-by: Julien Cristau <jcristau(a)debian.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith(a)oracle.com>
+
+commit 8cbca8a10761d1ea75a75bafa647632d6c0dac71
+Author: Gaetan Nadon <memsize(a)videotron.ca>
+Date: Tue Nov 9 13:04:44 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize(a)videotron.ca>
+
commit 3e8907305e1818369aef5a5c0da61f09e20de4f8
Author: Alan Coopersmith <alan.coopersmith(a)oracle.com>
Date: Fri Oct 29 22:02:10 2010 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.903/configure.ac new/libX11-1.4.0/configure.ac
--- old/libX11-1.3.99.903/configure.ac 2010-10-30 07:01:47.000000000 +0200
+++ new/libX11-1.4.0/configure.ac 2010-11-21 23:02:48.000000000 +0100
@@ -3,7 +3,7 @@
AC_PREREQ(2.60)
AC_INIT([libX11],
- [1.3.99.903],
+ [1.4.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
@@ -246,8 +246,8 @@
# arch specific things
WCHAR32="1"
-case $target_alias in
- *os2*) os2="true" ; WCHAR32="0" ;;
+case $host_os in
+ os2*) os2="true" ; WCHAR32="0" ;;
*) ;;
esac
AC_SUBST(WCHAR32)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libX11-1.3.99.903/specs/xmlrules.in new/libX11-1.4.0/specs/xmlrules.in
--- old/libX11-1.3.99.903/specs/xmlrules.in 2010-09-22 03:25:24.000000000 +0200
+++ new/libX11-1.4.0/specs/xmlrules.in 2010-11-10 17:24:55.000000000 +0100
@@ -37,11 +37,10 @@
endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS += -m $(XSL_STYLESHEET) --stringparam img.src.path=$(abs_builddir)/
-
-spec_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+XMLTO_FLAGS += \
+ -m $(XSL_STYLESHEET) \
+ --stringparam img.src.path=$(abs_builddir)/ \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
endif
CLEANFILES += $(spec_DATA)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0
Hello community,
here is the log from the commit of package libnet for openSUSE:Factory
checked in at Mon Nov 22 12:40:36 CET 2010.
--------
--- libnet/libnet.changes 2010-11-19 14:00:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/libnet/libnet.changes 2010-11-20 17:14:12.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Nov 20 16:14:05 UTC 2010 - coolo(a)novell.com
+
+- fix requires of devel package
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libnet.spec ++++++
--- /var/tmp/diff_new_pack.vooLV7/_old 2010-11-22 12:40:27.000000000 +0100
+++ /var/tmp/diff_new_pack.vooLV7/_new 2010-11-22 12:40:27.000000000 +0100
@@ -21,7 +21,7 @@
Name: libnet
Summary: A C Library for Portable Packet Creation
Version: 1.1.5
-Release: 1
+Release: 2
License: BSD3c(or similar)
Group: Development/Libraries/C and C++
Url: http://sourceforge.net/projects/libnet-dev
@@ -58,7 +58,7 @@
Summary: Devel files for libnet
License: BSD3c(or similar)
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}
+Requires: libnet1 = %{version}
%description -n libnet-devel
Libnet is an API to help with the construction and handling of network
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
1
0