openSUSE Commits
Threads by month
- ----- 2024 -----
- December
- November
- October
- September
- August
- 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
March 2009
- 1 participants
- 910 discussions
Hello community,
here is the log from the commit of package phonon for openSUSE:Factory
checked in at Mon Mar 2 01:25:47 CET 2009.
--------
--- KDE/phonon/phonon.changes 2009-01-22 09:23:51.000000000 +0100
+++ /mounts/work_src_done/STABLE/phonon/phonon.changes 2009-02-27 17:28:33.921153137 +0100
@@ -1,0 +2,6 @@
+Fri Feb 27 11:20:34 CET 2009 - dmueller(a)suse.de
+
+- update to 4.3.1:
+ * sync with the version in Qt 4.5.0, various bugfixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
phonon-4.3.0.tar.bz2
New:
----
phonon-4.3.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ phonon.spec ++++++
--- /var/tmp/diff_new_pack.P27819/_old 2009-03-02 01:23:22.000000000 +0100
+++ /var/tmp/diff_new_pack.P27819/_new 2009-03-02 01:23:22.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package phonon (Version 4.3.0)
+# spec file for package phonon (Version 4.3.1)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -32,7 +32,7 @@
%if %suse_version > 1020
BuildRequires: fdupes
%endif
-Version: 4.3.0
+Version: 4.3.1
Release: 1
License: LGPL v2.0 or later
Url: http://phonon.kde.org/
@@ -199,6 +199,9 @@
%endif
%changelog
+* Fri Feb 27 2009 dmueller(a)suse.de
+- update to 4.3.1:
+ * sync with the version in Qt 4.5.0, various bugfixes
* Thu Jan 22 2009 dmueller(a)suse.de
- update to 4.3.0:
* Qt 4.5 fixes
++++++ phonon-4.3.0.tar.bz2 -> phonon-4.3.1.tar.bz2 ++++++
++++ 17578 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 soprano for openSUSE:Factory
checked in at Mon Mar 2 01:23:13 CET 2009.
--------
--- soprano/soprano-backend-sesame.changes 2009-01-22 09:27:03.000000000 +0100
+++ /mounts/work_src_done/STABLE/soprano/soprano-backend-sesame.changes 2009-02-27 11:19:44.000000000 +0100
@@ -1,0 +2,16 @@
+Fri Feb 27 11:19:15 CET 2009 - dmueller(a)suse.de
+
+- update to 2.2.2:
+ * Properly clear the error in the SparqlModel
+ * Made all D-Bus dependant parts optional for successful compilation on Windows.
+ * Redland include dir fix.
+ * New cmake options to manually disable all optional components:
+ o Redland backend
+ o Sesame2 backend
+ o Raptor parser/serializer
+ o CLucene full text index
+ o D-Bus integration
+ o Apidox generation
+ * Less use of dynamic_cast
+
+-------------------------------------------------------------------
soprano.changes: same change
calling whatdependson for head-i586
Old:
----
soprano-2.1.67.tar.bz2
New:
----
soprano-2.2.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ soprano-backend-sesame.spec ++++++
--- /var/tmp/diff_new_pack.b26570/_old 2009-03-02 01:22:35.000000000 +0100
+++ /var/tmp/diff_new_pack.b26570/_new 2009-03-02 01:22:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package soprano-backend-sesame (Version 2.1.67)
+# spec file for package soprano-backend-sesame (Version 2.2.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,7 +29,7 @@
# COMMON1-BEGIN
BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel
BuildRequires: clucene-core-devel doxygen raptor
-Version: 2.1.67
+Version: 2.2.2
Release: 1
Source: soprano-%{version}.tar.bz2
Patch0: jni-include-fix.diff
@@ -80,6 +80,19 @@
/usr/share/soprano/plugins/sesame2backend.desktop
%changelog
+* Fri Feb 27 2009 dmueller(a)suse.de
+- update to 2.2.2:
+ * Properly clear the error in the SparqlModel
+ * Made all D-Bus dependant parts optional for successful compilation on Windows.
+ * Redland include dir fix.
+ * New cmake options to manually disable all optional components:
+ o Redland backend
+ o Sesame2 backend
+ o Raptor parser/serializer
+ o CLucene full text index
+ o D-Bus integration
+ o Apidox generation
+ * Less use of dynamic_cast
* Thu Jan 22 2009 dmueller(a)suse.de
- update to 2.1.67:
* New class Soprano::Client::SparqlModel which provides a client to http Sparql endpoints.
++++++ soprano.spec ++++++
--- /var/tmp/diff_new_pack.b26570/_old 2009-03-02 01:22:35.000000000 +0100
+++ /var/tmp/diff_new_pack.b26570/_new 2009-03-02 01:22:35.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package soprano (Version 2.1.67)
+# spec file for package soprano (Version 2.2.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -28,7 +28,7 @@
# COMMON1-BEGIN
BuildRequires: cmake kde4-filesystem libqt4-devel libraptor-devel libredland-devel
BuildRequires: clucene-core-devel doxygen raptor
-Version: 2.1.67
+Version: 2.2.2
Release: 1
Source: soprano-%{version}.tar.bz2
Patch0: jni-include-fix.diff
@@ -185,6 +185,19 @@
/usr/share/soprano/plugins/redlandbackend.desktop
%changelog
+* Fri Feb 27 2009 dmueller(a)suse.de
+- update to 2.2.2:
+ * Properly clear the error in the SparqlModel
+ * Made all D-Bus dependant parts optional for successful compilation on Windows.
+ * Redland include dir fix.
+ * New cmake options to manually disable all optional components:
+ o Redland backend
+ o Sesame2 backend
+ o Raptor parser/serializer
+ o CLucene full text index
+ o D-Bus integration
+ o Apidox generation
+ * Less use of dynamic_cast
* Thu Jan 22 2009 dmueller(a)suse.de
- update to 2.1.67:
* New class Soprano::Client::SparqlModel which provides a client to http Sparql endpoints.
++++++ soprano-2.1.67.tar.bz2 -> soprano-2.2.2.tar.bz2 ++++++
++++ 2224 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 yast2-libyui for openSUSE:Factory
checked in at Mon Mar 2 01:22:12 CET 2009.
--------
--- yast2-libyui/yast2-libyui.changes 2009-02-22 21:11:17.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-libyui/yast2-libyui.changes 2009-03-01 17:33:41.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 1 17:26:31 CET 2009 - coolo(a)suse.de
+
+- hopefully last fix ;(
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-libyui.spec ++++++
--- /var/tmp/diff_new_pack.o25344/_old 2009-03-02 01:21:56.000000000 +0100
+++ /var/tmp/diff_new_pack.o25344/_new 2009-03-02 01:21:56.000000000 +0100
@@ -20,7 +20,7 @@
Name: yast2-libyui
Version: 2.18.6
-Release: 1
+Release: 2
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -123,6 +123,8 @@
%{_datadir}/cmake/Modules/*
%doc %{prefix}/share/doc/packages/yast2-libyui
%changelog
+* Sun Mar 01 2009 coolo(a)suse.de
+- hopefully last fix ;(
* Sun Feb 22 2009 coolo(a)suse.de
- another fix
- V 2.18.6
++++++ yast2-libyui-2.18.6.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.18.6/examples/SelectionBox3-many-items.cc new/yast2-libyui-2.18.6/examples/SelectionBox3-many-items.cc
--- old/yast2-libyui-2.18.6/examples/SelectionBox3-many-items.cc 2008-10-16 16:42:57.000000000 +0200
+++ new/yast2-libyui-2.18.6/examples/SelectionBox3-many-items.cc 2009-03-01 17:26:52.000000000 +0100
@@ -19,6 +19,7 @@
#include "YPushButton.h"
#include "YAlignment.h"
#include "YEvent.h"
+#include <stdio.h>
#define ITEM_COUNT 10000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.18.6/examples/Table-many-items.cc new/yast2-libyui-2.18.6/examples/Table-many-items.cc
--- old/yast2-libyui-2.18.6/examples/Table-many-items.cc 2008-10-16 19:50:00.000000000 +0200
+++ new/yast2-libyui-2.18.6/examples/Table-many-items.cc 2009-03-01 17:26:52.000000000 +0100
@@ -22,6 +22,7 @@
#include "YPushButton.h"
#include "YAlignment.h"
#include "YEvent.h"
+#include <stdio.h>
#define ITEM_COUNT 1000
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-libyui-2.18.6/src/FSize.cc new/yast2-libyui-2.18.6/src/FSize.cc
--- old/yast2-libyui-2.18.6/src/FSize.cc 2008-02-11 19:25:50.000000000 +0100
+++ new/yast2-libyui-2.18.6/src/FSize.cc 2009-03-01 17:26:52.000000000 +0100
@@ -19,6 +19,7 @@
/-*/
+#include <stdio.h>
#include <stdlib.h>
#include <iostream>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 wpa_supplicant for openSUSE:Factory
checked in at Mon Mar 2 01:21:46 CET 2009.
--------
--- wpa_supplicant/wpa_supplicant.changes 2009-02-09 16:07:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/wpa_supplicant/wpa_supplicant.changes 2009-03-01 17:03:09.442305000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 1 17:03:04 CET 2009 - coolo(a)suse.de
+
+- fix compilation with gcc 4.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
wpa_supplicant-gcc44.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wpa_supplicant.spec ++++++
--- /var/tmp/diff_new_pack.B21656/_old 2009-03-02 01:19:51.000000000 +0100
+++ /var/tmp/diff_new_pack.B21656/_new 2009-03-02 01:19:51.000000000 +0100
@@ -22,7 +22,7 @@
BuildRequires: dbus-1-devel libqt4 libqt4-devel openssl-devel pkg-config readline-devel
Url: http://hostap.epitest.fi/wpa_supplicant/
Version: 0.6.4
-Release: 24
+Release: 25
License: BSD 3-Clause; GPL v2 or later
Group: Productivity/Networking/Other
Summary: WPA supplicant implementation
@@ -46,6 +46,7 @@
Patch13: wpa_supplicant-fix_dbus_config2.patch
Patch14: wpa_supplicant-fix_ap_ordering.patch
Patch15: wpa_supplicant-respect_no_reply.patch
+Patch16: wpa_supplicant-gcc44.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -95,6 +96,7 @@
%patch13 -p2
%patch14 -p2
%patch15 -p2
+%patch16 -p1
%build
cd wpa_supplicant
@@ -139,6 +141,8 @@
/usr/sbin/wpa_gui
%changelog
+* Sun Mar 01 2009 coolo(a)suse.de
+- fix compilation with gcc 4.4
* Mon Feb 09 2009 hschaa(a)suse.de
- Add wpa_supplicant-respect_no_reply.patch which avoids
D-Bus errors if no reply was requested by the caller
++++++ wpa_supplicant-gcc44.patch ++++++
--- wpa_supplicant-0.6.4.orig//wpa_supplicant/wpa_gui-qt4/networkconfig.cpp 2008-08-10 17:33:12.000000000 +0000
+++ wpa_supplicant-0.6.4/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp 2009-03-01 15:57:45.000000000 +0000
@@ -12,6 +12,7 @@
* See README and COPYING for more details.
*/
+#include <stdio.h>
#include <QMessageBox>
#include "networkconfig.h"
--- wpa_supplicant-0.6.4.orig//wpa_supplicant/wpa_gui-qt4/scanresults.cpp 2008-08-10 17:33:12.000000000 +0000
+++ wpa_supplicant-0.6.4/wpa_supplicant/wpa_gui-qt4/scanresults.cpp 2009-03-01 15:57:29.000000000 +0000
@@ -12,6 +12,7 @@
* See README and COPYING for more details.
*/
+#include <stdio.h>
#include "scanresults.h"
#include "wpagui.h"
#include "networkconfig.h"
--- wpa_supplicant-0.6.4.orig//wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2008-08-10 17:33:12.000000000 +0000
+++ wpa_supplicant-0.6.4/wpa_supplicant/wpa_gui-qt4/wpagui.cpp 2009-03-01 15:57:08.000000000 +0000
@@ -20,6 +20,7 @@
#include <QMessageBox>
#include <QCloseEvent>
+#include <stdio.h>
#include "wpagui.h"
#include "dirent.h"
#include "wpa_ctrl.h"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-server for openSUSE:Factory
checked in at Mon Mar 2 01:19:43 CET 2009.
--------
--- xorg-x11-server/xorg-x11-server.changes 2009-02-24 12:09:23.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2009-02-27 18:12:42.904194062 +0100
@@ -1,0 +2,14 @@
+Fri Feb 27 12:40:32 CET 2009 - sndirsch(a)suse.de
+
+- xorg-server 1.6.0
+- temporarily disabled build of Xvnc/libvnc.so
+- obsoletes 64bit-portability-issue.diff, 64bit.diff,
+ commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff,
+ miPointerUpdate-crashfix.diff, p_mouse_misc.diff,
+ ps_showopts.diff, unplugged_monitor_crashfix.diff
+- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch,
+ bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff,
+ p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff,
+ xorg-server-xf4vnc.patch, zap_warning_xserver.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
64bit.diff
64bit-portability-issue.diff
commit-59f9fb4b8.diff
commit-a9e2030.diff
dga_cleanup.diff
miPointerUpdate-crashfix.diff
p_mouse_misc.diff
ps_showopts.diff
unplugged_monitor_crashfix.diff
xorg-server-1.5.2.tar.bz2
New:
----
xorg-server-1.6.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100
@@ -19,9 +19,10 @@
Name: xorg-x11-server
-%define dirsuffix 1.5.2
+%define dirsuffix 1.6.0
%define fglrx_driver_hack 0
-%define vnc 1
+### FIXME
+%define vnc 0
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
%if %vnc
BuildRequires: libjpeg-devel
@@ -29,7 +30,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
-Release: 27
+Release: 28
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -56,13 +57,10 @@
%endif
Source7: xorg-docs-1.4.tar.bz2
Source8: xorg.conf.man-070818.tar
-Patch: 64bit.diff
Patch1: fpic.diff
Patch2: p_default-module-path.diff
Patch6: pu_fixes.diff
-Patch7: p_mouse_misc.diff
Patch8: p_bug96328.diff
-Patch11: ps_showopts.diff
Patch13: p_xorg_acpi.diff
Patch14: p_xkills_wrong_client.diff
Patch16: p_xnest-ignore-getimage-errors.diff
@@ -101,16 +99,10 @@
Patch109: events.diff
Patch112: fix-dpi-values.diff
Patch113: no-return-in-nonvoid-function.diff
-Patch114: 64bit-portability-issue.diff
Patch117: acpi-warning.diff
Patch118: exa-greedy.diff
-Patch120: dga_cleanup.diff
-Patch121: miPointerUpdate-crashfix.diff
-Patch122: unplugged_monitor_crashfix.diff
Patch123: vidmode-sig11.diff
-Patch124: commit-59f9fb4b8.diff
Patch125: 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch
-Patch126: commit-a9e2030.diff
Patch127: dpms_screensaver.diff
Patch128: pci-legacy-mem-fallback.diff
Patch129: bug474071-fix1.diff
@@ -172,13 +164,10 @@
%prep
%setup -q -n xorg-server-%{dirsuffix} -a4 -a7 -a8
-%patch
%patch1
%patch2
%patch6
-%patch7 -p2
%patch8 -p0
-%patch11
%patch13
%patch14
%patch16 -p2
@@ -224,16 +213,10 @@
%patch109 -p1
%patch112 -p0
%patch113 -p0
-%patch114 -p0
%patch117
%patch118 -p1
-%patch120 -p1
-%patch121 -p0
-%patch122 -p0
%patch123 -p0
-%patch124 -p1
%patch125 -p1
-%patch126 -p1
%patch127 -p1
%patch128
pushd hw/xfree86/os-support/bus
@@ -509,19 +492,11 @@
/usr/bin/dmxwininfo
%ifnarch s390 s390x
/usr/bin/gtf
-/usr/bin/inb
-/usr/bin/inl
-/usr/bin/inw
-/usr/bin/ioport
-/usr/bin/outb
-/usr/bin/outl
-/usr/bin/outw
%endif
/usr/bin/vdltodmx
/usr/bin/xdmx
/usr/bin/xdmxconfig
%ifnarch s390 s390x
-/usr/bin/xorgconfig
/usr/%{_lib}/X11/*
/usr/%{_lib}/xorg/modules/
%{_mandir}/man4/*
@@ -570,6 +545,17 @@
%endif
%changelog
+* Fri Feb 27 2009 sndirsch(a)suse.de
+- xorg-server 1.6.0
+- temporarily disabled build of Xvnc/libvnc.so
+- obsoletes 64bit-portability-issue.diff, 64bit.diff,
+ commit-59f9fb4b8.diff, commit-a9e2030.diff, dga_cleanup.diff,
+ miPointerUpdate-crashfix.diff, p_mouse_misc.diff,
+ ps_showopts.diff, unplugged_monitor_crashfix.diff
+- adjusted 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch,
+ bitmap_always_unscaled.diff, confine_to_shape.diff, fbdevhw.diff,
+ p_ia64-console.diff, randr1_1-sig11.diff, xephyr.diff,
+ xorg-server-xf4vnc.patch, zap_warning_xserver.diff
* Tue Feb 24 2009 sndirsch(a)suse.de
- bug474071-fix1.diff
* fixes Xserver issue of bnc #474071
++++++ 0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100
@@ -10,41 +10,36 @@
hw/xfree86/common/xf86Xinput.c | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
-diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
-index 710e787..c0b6124 100644
---- a/hw/xfree86/common/xf86Xinput.c
-+++ b/hw/xfree86/common/xf86Xinput.c
-@@ -466,17 +466,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pDev)
- else
- xf86DeleteInput(pInfo, 0);
+--- xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c.orig 2009-02-25 20:12:11.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/common/xf86Xinput.c 2009-02-27 17:26:35.000000000 +0100
+@@ -675,17 +675,20 @@ DeleteInputDeviceRequest(DeviceIntPtr pD
+ else
+ xf86DeleteInput(pInfo, 0);
-- /* devices added through HAL aren't in the config layout */
-- it = xf86ConfigLayout.inputs;
-- while(*it && *it != idev)
-- it++;
+- /* devices added through HAL aren't in the config layout */
+- it = xf86ConfigLayout.inputs;
+- while(*it && *it != idev)
+- it++;
-
-- if (!(*it)) /* end of list, not in the layout */
-+ if (idev)
- {
-- xfree(idev->driver);
-- xfree(idev->identifier);
-- xf86optionListFree(idev->commonOptions);
-- xfree(idev);
-+ /* devices added through HAL aren't in the config layout */
-+ it = xf86ConfigLayout.inputs;
-+ while(*it && *it != idev)
-+ it++;
+- if (!(*it)) /* end of list, not in the layout */
++ if (idev)
+ {
+- xfree(idev->driver);
+- xfree(idev->identifier);
+- xf86optionListFree(idev->commonOptions);
+- xfree(idev);
++ /* devices added through HAL aren't in the config layout */
++ it = xf86ConfigLayout.inputs;
++ while(*it && *it != idev)
++ it++;
+
-+ if (!(*it)) /* end of list, not in the layout */
-+ {
-+ xfree(idev->driver);
-+ xfree(idev->identifier);
-+ xf86optionListFree(idev->commonOptions);
-+ xfree(idev);
-+ }
++ if (!(*it)) /* end of list, not in the layout */
++ {
++ xfree(idev->driver);
++ xfree(idev->identifier);
++ xf86optionListFree(idev->commonOptions);
++ xfree(idev);
++ }
+ }
}
- }
-
---
-1.5.2.4
-
+ OsReleaseSignals();
++++++ bitmap_always_unscaled.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100
@@ -53,21 +53,3 @@
case $host_os in
darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;;
esac
---- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200
-+++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200
-@@ -1908,14 +1908,12 @@
- {
- /* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/
- "/local/",
-- "/misc/",
-+ "/misc/:unscaled",
- "/75dpi/:unscaled",
- "/100dpi/:unscaled",
- "/Type1/",
- "/TrueType/",
- "/freefont/",
-- "/75dpi/",
-- "/100dpi/",
- 0 /* end of fontpaths */
- };
-
++++++ confine_to_shape.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100
@@ -1,23 +1,19 @@
-Index: events.c
-===================================================================
-RCS file: /home/eich/cvs/xc/programs/Xserver/dix/events.c,v
-retrieving revision 1.1.1.19
-diff -u -r1.1.1.19 events.c
---- dix/events.c.orig 26 Aug 2004 12:09:13 -0000 1.1.1.19
-+++ dix/events.c 2 Mar 2005 20:04:13 -0000
-@@ -656,35 +656,79 @@
+--- dix/events.c.orig 2009-02-25 20:12:10.000000000 +0100
++++ dix/events.c 2009-02-27 16:53:47.000000000 +0100
+@@ -786,37 +786,80 @@ ConfineToShape(DeviceIntPtr pDev, Region
{
BoxRec box;
int x = *px, y = *py;
- int incx = 1, incy = 1;
--
+ SpritePtr pSprite;
+ int nbox;
+ BoxPtr pbox;
-+ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r;
-+
- if (POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box))
++ int d, min = (~0U >> 1), dx2, dy2, x_r, y_r;
+
+ pSprite = pDev->spriteInfo->sprite;
+ if (POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box))
return;
-- box = *REGION_EXTENTS(sprite.hot.pScreen, shape);
+- box = *REGION_EXTENTS(pSprite->hot.pScreen, shape);
- /* this is rather crude */
- do {
- x += incx;
@@ -27,27 +23,27 @@
- x = *px - 1;
+
+ for (nbox = REGION_NUM_RECTS (shape),
-+ pbox = REGION_RECTS(shape);
++ pbox = REGION_RECTS(shape);
+ nbox--;
+ pbox++)
+ {
-+ if (pbox->x1 < x && pbox->x2 > x) {
-+ d = pbox->y1 - y;
-+ if (d >= 0) {
-+ d *= d;
-+ if (d < min) {
-+ *px = x;
-+ *py = pbox->y1 + 1;
-+ min = d;
-+ }
-+ } else {
-+ d = pbox->y2 - y; d *= d;
-+ if (d < min) {
-+ *px = x;
-+ *py = pbox->y2 - 1;
-+ min = d;
-+ }
-+ }
++ if (pbox->x1 < x && pbox->x2 > x) {
++ d = pbox->y1 - y;
++ if (d >= 0) {
++ d *= d;
++ if (d < min) {
++ *px = x;
++ *py = pbox->y1 + 1;
++ min = d;
++ }
++ } else {
++ d = pbox->y2 - y; d *= d;
++ if (d < min) {
++ *px = x;
++ *py = pbox->y2 - 1;
++ min = d;
++ }
++ }
}
- else if (x < box.x1)
- {
@@ -58,54 +54,53 @@
- {
- incy = -1;
- y = *py - 1;
-+ else if (pbox->y1 < y && pbox->y2 > y) {
-+ d = pbox->x1 - x;
-+ if (d >= 0) {
-+ d *= d;
-+ if (d < min) {
-+ *px = pbox->x1 + 1;
-+ *py = y;
-+ min = d;
-+ }
-+ } else {
-+ d = pbox->x2 - x; d *= d;
-+ if (d < min) {
-+ *px = pbox->x2 - 1;
-+ *py = y;
-+ min = d;
-+ }
-+ }
-+
-+ } else {
-+ dx2 = pbox->x1 - x;
-+ if (dx2 >= 0) {
-+ dx2 *= dx2;
-+ x_r = pbox->x1 + 1;
-+ } else {
-+ dx2 = pbox->x2 - x; dx2 *= dx2;
-+ x_r = pbox->x2 - 1;
-+ }
-+ dy2 = pbox->y1 - y;
-+ if (dy2 >= 0) {
-+ dy2 *= dy2;
-+ y_r = pbox->y1 + 1;
-+ } else {
-+ dy2 = pbox->y2 - y; dy2 *= dy2;
-+ y_r = pbox->y2 - 1;
-+ }
-+ if ((d = dx2 + dy2) < min) {
-+ *px = x_r;
-+ *py = y_r;
-+ min = d;
++ else if (pbox->y1 < y && pbox->y2 > y) {
++ d = pbox->x1 - x;
++ if (d >= 0) {
++ d *= d;
++ if (d < min) {
++ *px = pbox->x1 + 1;
++ *py = y;
++ min = d;
++ }
++ } else {
++ d = pbox->x2 - x; d *= d;
++ if (d < min) {
++ *px = pbox->x2 - 1;
++ *py = y;
++ min = d;
++ }
++ }
++
++ } else {
++ dx2 = pbox->x1 - x;
++ if (dx2 >= 0) {
++ dx2 *= dx2;
++ x_r = pbox->x1 + 1;
++ } else {
++ dx2 = pbox->x2 - x; dx2 *= dx2;
++ x_r = pbox->x2 - 1;
++ }
++ dy2 = pbox->y1 - y;
++ if (dy2 >= 0) {
++ dy2 *= dy2;
++ y_r = pbox->y1 + 1;
++ } else {
++ dy2 = pbox->y2 - y; dy2 *= dy2;
++ y_r = pbox->y2 - 1;
++ }
++ if ((d = dx2 + dy2) < min) {
++ *px = x_r;
++ *py = y_r;
++ min = d;
}
- else if (y < box.y1)
- return; /* should never get here! */
}
-- } while (!POINT_IN_REGION(sprite.hot.pScreen, shape, x, y, &box));
+- } while (!POINT_IN_REGION(pSprite->hot.pScreen, shape, x, y, &box));
- *px = x;
- *py = y;
-+ }
-+
++ }
}
- #endif
+ static void
++++++ fbdevhw.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:36.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:36.000000000 +0100
@@ -1,15 +1,3 @@
---- hw/xfree86/fbdevhw/fbdevhw.c.orig 2007-09-03 20:48:47.000000000 +0000
-+++ hw/xfree86/fbdevhw/fbdevhw.c 2007-09-03 20:53:12.000000000 +0000
-@@ -245,7 +245,8 @@
- set->green.length == req->green.length &&
- set->blue.length == req->blue.length &&
- set->xres == req->xres && set->yres == req->yres &&
-- set->pixclock == req->pixclock &&
-+ /* xenfb sets pixclock to 0 (Novell Bug #285523) */
-+ ((set->pixclock == req->pixclock) || !set->pixclock) &&
- set->right_margin == req->right_margin &&
- set->hsync_len == req->hsync_len &&
- set->left_margin == req->left_margin &&
--- hw/xfree86/fbdevhw/fbdevhw.c.orig 2008-04-20 03:06:32.000000000 +0000
+++ hw/xfree86/fbdevhw/fbdevhw.c 2008-04-20 03:30:00.000000000 +0000
@@ -923,9 +923,10 @@ fbdevHWDPMSSet(ScrnInfoPtr pScrn, int mo
++++++ p_ia64-console.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100
@@ -24,19 +24,19 @@
return(TRUE);
}
}
---- linux/lnx_init.c.orig 2007-08-23 21:04:53.000000000 +0200
-+++ linux/lnx_init.c 2007-09-29 16:19:53.771798500 +0200
-@@ -240,9 +240,6 @@
-
- if (!ShareVTs)
+--- linux/lnx_init.c.orig 2009-02-27 15:41:39.000000000 +0100
++++ linux/lnx_init.c 2009-02-27 15:41:47.000000000 +0100
+@@ -252,9 +252,6 @@ xf86OpenConsole(void)
{
+ struct termios nTty;
+
-#if defined(DO_OS_FONTRESTORE)
- lnx_savefont();
-#endif
/*
* now get the VT. This _must_ succeed, or else fail completely.
*/
-@@ -254,6 +251,10 @@
+@@ -266,6 +263,10 @@ xf86OpenConsole(void)
FatalError("xf86OpenConsole: VT_WAITACTIVE failed: %s\n",
strerror(errno));
@@ -47,19 +47,19 @@
if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0)
FatalError("xf86OpenConsole: VT_GETMODE failed %s\n",
strerror(errno));
-@@ -342,6 +343,11 @@
+@@ -384,6 +385,11 @@ xf86CloseConsole()
if (VTSwitch)
{
+#if defined(DO_OS_FONTRESTORE)
-+ if (xf86Info.vtno == vtno) /* check if we are active */
++ if (xf86Info.vtno == vtno) /* check if we are active */
+ lnx_restorefont();
-+ lnx_freefontdata();
++ lnx_freefontdata();
+#endif
/*
* Perform a switch back to the active VT when we were started
*/
-@@ -356,11 +362,6 @@
+@@ -398,11 +404,6 @@ xf86CloseConsole()
activeVT = -1;
}
++++++ randr1_1-sig11.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100
@@ -1,14 +1,12 @@
-diff --git a/hw/xfree86/common/xf86RandR.c b/hw/xfree86/common/xf86RandR.c
-index 4432ad9..7e446de 100644
---- a/hw/xfree86/common/xf86RandR.c
-+++ b/hw/xfree86/common/xf86RandR.c
-@@ -223,6 +223,9 @@ xf86RandRSetConfig (ScreenPtr pScreen,
+--- xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c.orig 2009-02-25 20:12:11.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/common/xf86RandR.c 2009-02-27 17:04:34.000000000 +0100
+@@ -246,6 +246,9 @@ xf86RandRSetConfig (ScreenPtr pScreen,
Bool useVirtual = FALSE;
Rotation oldRotation = randrp->rotation;
+ if (!scrp->vtSema)
+ return FALSE;
+
- miPointerPosition (&px, &py);
+ miPointerGetPosition(inputInfo.pointer, &px, &py);
for (mode = scrp->modes; ; mode = mode->next)
{
++++++ xephyr.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:37.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:37.000000000 +0100
@@ -1,25 +1,19 @@
---- hw/kdrive/Makefile.am.orig 2006-10-23 16:23:04.000000000 +0200
-+++ hw/kdrive/Makefile.am 2006-10-23 16:23:34.000000000 +0200
-@@ -1,10 +1,9 @@
- if KDRIVEVESA
--VESA_SUBDIRS = vesa ati chips epson i810 mach64 mga nvidia pm2 r128 \
-- smi via
-+VESA_SUBDIRS =
- endif
-
+--- hw/kdrive/Makefile.am.orig 2008-11-14 22:27:05.000000000 +0100
++++ hw/kdrive/Makefile.am 2009-02-27 15:45:07.000000000 +0100
+@@ -1,5 +1,5 @@
if BUILD_KDRIVEFBDEVLIB
-FBDEV_SUBDIRS = fbdev
+FBDEV_SUBDIRS =
endif
- if XSDLSERVER
-@@ -21,8 +20,7 @@
+ if XFAKESERVER
+@@ -21,8 +21,7 @@
+ SERVER_SUBDIRS = \
$(XSDL_SUBDIRS) \
$(FBDEV_SUBDIRS) \
- $(VESA_SUBDIRS) \
- $(XEPHYR_SUBDIRS) \
- $(XFAKE_SUBDIRS)
+ $(XEPHYR_SUBDIRS)
- DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
- smi via fbdev sdl ephyr src linux fake sis300
+ SUBDIRS = \
+ src \
++++++ xorg-server-1.5.2.tar.bz2 -> xorg-server-1.6.0.tar.bz2 ++++++
++++ 529222 lines of diff (skipped)
++++++ xorg-server-xf4vnc.patch ++++++
++++ 1215 lines (skipped)
++++ between xorg-x11-server/xorg-server-xf4vnc.patch
++++ and /mounts/work_src_done/STABLE/xorg-x11-server/xorg-server-xf4vnc.patch
++++++ zap_warning_xserver.diff ++++++
--- /var/tmp/diff_new_pack.p18577/_old 2009-03-02 01:18:49.000000000 +0100
+++ /var/tmp/diff_new_pack.p18577/_new 2009-03-02 01:18:49.000000000 +0100
@@ -1,31 +1,4 @@
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c
---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Config.c 2008-03-09 12:36:39.000000000 +0100
-+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Config.c 2008-03-09 13:33:17.000000000 +0100
-@@ -743,6 +743,7 @@
- FLAG_NOTRAPSIGNALS,
- FLAG_DONTVTSWITCH,
- FLAG_DONTZAP,
-+ FLAG_ZAPWARNING,
- FLAG_DONTZOOM,
- FLAG_DISABLEVIDMODE,
- FLAG_ALLOWNONLOCAL,
-@@ -788,6 +789,8 @@
- {0}, FALSE },
- { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
- {0}, FALSE },
-+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
-+ {0}, FALSE },
- { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
- {0}, FALSE },
- { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
-@@ -912,6 +915,7 @@
- xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
- xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
-+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
- xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
-
- xf86GetOptValBool(FlagOptions, FLAG_ALLOW_DEACTIVATE_GRABS,
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c
--- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Events.c 2008-03-09 13:27:24.000000000 +0100
+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Events.c 2008-03-09 13:30:18.000000000 +0100
@@ -61,16 +34,6 @@
case ACTION_NEXT_MODE:
if (!xf86Info.dontZoom)
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c
---- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Globals.c 2008-03-09 12:36:39.000000000 +0100
-+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Globals.c 2008-03-09 13:31:40.000000000 +0100
-@@ -107,6 +107,7 @@
- FALSE, /* inputPending */
- FALSE, /* dontVTSwitch */
- FALSE, /* dontZap */
-+ FALSE, /* ZapWarning */
- FALSE, /* dontZoom */
- FALSE, /* notrapSignals */
- FALSE, /* caughtSignal */
diff -ur xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h
--- xorg-server-1.4.0.90-orig//hw/xfree86/common/xf86Privstr.h 2007-12-07 03:38:42.000000000 +0100
+++ xorg-server-1.4.0.90/hw/xfree86/common/xf86Privstr.h 2008-03-09 13:29:43.000000000 +0100
@@ -99,20 +62,74 @@
.BI "Option \*qDontZoom\*q \*q" boolean \*q
This disallows the use of the
.B Ctrl+Alt+Keypad\-Plus
---- xorg-server-1.4.0.90-orig/hw/xfree86/doc/man/Xorg.man.pre.orig 2008-05-16 16:46:39.000000000 +0200
-+++ xorg-server-1.4.0.90/hw/xfree86/doc/man/Xorg.man.pre 2008-05-16 16:48:50.000000000 +0200
-@@ -461,10 +461,10 @@
- are:
- .TP 8
- .B Ctrl+Alt+Backspace
--Immediately kills the server -- no questions asked. This can be disabled
--with the
+--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-25 20:12:11.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-27 16:28:19.000000000 +0100
+@@ -697,6 +697,7 @@ typedef enum {
+ FLAG_NOTRAPSIGNALS,
+ FLAG_DONTVTSWITCH,
+ FLAG_DONTZAP,
++ FLAG_ZAPWARNING,
+ FLAG_DONTZOOM,
+ FLAG_DISABLEVIDMODE,
+ FLAG_ALLOWNONLOCAL,
+@@ -734,6 +735,8 @@ static OptionInfoRec FlagOptions[] = {
+ {0}, FALSE },
+ { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
+ {0}, TRUE },
++ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
++ {0}, FALSE },
+ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
+ {0}, FALSE },
+ { FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
+@@ -847,6 +850,7 @@ configServerFlags(XF86ConfFlagsPtr flags
+ xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
+ if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
+ xf86Info.dontZap = !party_like_its_1989;
++ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
+
+ xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
+--- xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c.orig 2009-02-27 16:23:51.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/common/xf86Globals.c 2009-02-27 16:30:19.000000000 +0100
+@@ -106,6 +106,7 @@ xf86InfoRec xf86Info = {
+ .vtRequestsPending = FALSE,
+ .dontVTSwitch = FALSE,
+ .dontZap = FALSE,
++ .ZapWarning = FALSE,
+ .dontZoom = FALSE,
+ .notrapSignals = FALSE,
+ .caughtSignal = FALSE,
+--- xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre.orig 2009-02-25 20:12:11.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/doc/man/Xorg.man.pre 2009-02-27 16:32:45.000000000 +0100
+@@ -452,8 +452,8 @@ are:
+ Immediately kills the server -- no questions asked. This is disabled by
+ default. It can be enabled with the -retro command line flag or by setting
+ the
-.B DontZap
--__xconfigfile__(__filemansuffix__) file option.
-+Immediately kills the server -- no questions asked. This behaviour can
-+be changed with the
+-__xconfigfile__(__filemansuffix__) file option to a FALSE value.
+.B DontZap/ZapWarning
-+__xconfigfile__(__filemansuffix__) file options.
++__xconfigfile__(__filemansuffix__) file options to a FALSE value.
.TP 8
.B Ctrl+Alt+Keypad-Plus
Change video mode to next one specified in the configuration file.
+--- xorg-server-1.6.0/hw/xfree86/common/xf86Config.c.orig 2009-02-28 20:29:42.000000000 +0100
++++ xorg-server-1.6.0/hw/xfree86/common/xf86Config.c 2009-02-28 20:30:44.000000000 +0100
+@@ -734,7 +734,7 @@ static OptionInfoRec FlagOptions[] = {
+ { FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
+ {0}, FALSE },
+ { FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
+- {0}, TRUE },
++ {0}, FALSE },
+ { FLAG_ZAPWARNING, "ZapWarning", OPTV_BOOLEAN,
+ {0}, FALSE },
+ { FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
+@@ -848,8 +848,7 @@ configServerFlags(XF86ConfFlagsPtr flags
+
+ xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
+ xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
+- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
+- xf86Info.dontZap = !party_like_its_1989;
++ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
+ xf86GetOptValBool(FlagOptions, FLAG_ZAPWARNING, &xf86Info.ZapWarning);
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 t1lib for openSUSE:Factory
checked in at Mon Mar 2 01:18:24 CET 2009.
--------
--- t1lib/t1lib.changes 2007-09-20 19:15:22.000000000 +0200
+++ /mounts/work_src_done/STABLE/t1lib/t1lib.changes 2009-03-02 00:59:42.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Mar 2 00:57:49 CET 2009 - crrodriguez(a)suse.de
+
+- taking over this package, PHP depends on it.
+- update to version 5.1.2, only obsoletes previuosly added patches
+- merge debian patches
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bugzilla-240159-array-subscript-out-of-bounds.patch
t1lib-5.1.1-bof.patch
t1lib-5.1.1.tar.bz2
New:
----
t1lib_5.1.2-3.diff.gz
t1lib-5.1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ t1lib.spec ++++++
--- /var/tmp/diff_new_pack.O16900/_old 2009-03-02 01:17:28.000000000 +0100
+++ /var/tmp/diff_new_pack.O16900/_new 2009-03-02 01:17:28.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package t1lib (Version 5.1.1)
+# spec file for package t1lib (Version 5.1.2)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,17 +19,16 @@
Name: t1lib
-BuildRequires: xorg-x11-devel
+BuildRequires: quilt xorg-x11-devel
License: LGPL v2.1 or later
Group: System/Libraries
AutoReqProv: on
-Version: 5.1.1
-Release: 100
+Version: 5.1.2
+Release: 1
Url: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/
Source: ftp://sunsite.unc.edu/pub/Linux/libs/graphics/%{name}-%{version}.tar.bz2
Patch0: t1lib-auto.patch
-Patch2: bugzilla-240159-array-subscript-out-of-bounds.patch
-Patch3: t1lib-5.1.1-bof.patch
+Patch1: t1lib_5.1.2-3.diff.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Summary: Adobe Type 1 Font Rasterizing Library
@@ -65,19 +64,20 @@
%prep
%setup -q -n t1lib-%{version}
%patch0 -p1 -b .auto
-%patch2 -p1
-%patch3
+%patch1 -p1
+QUILT_PATCHES=debian/patches quilt push -a
%build
-autoreconf -fi
+autoreconf -fiv
export CFLAGS="%{optflags} -fno-strict-aliasing"
export CXXFLAGS="%{optflags} -fno-strict-aliasing"
%configure --disable-static --with-pic
-%{__make} without_doc
+%{__make} %{?jobs:-j%jobs} without_doc
%install
%{__make} DESTDIR=%{buildroot} install
%{__rm} -f %{buildroot}%{_datadir}/t1lib/doc/t1lib_doc*
+%{__rm} -f %{buildroot}%{_libdir}/*.la
%clean
%{__rm} -rf %{buildroot}
@@ -90,8 +90,6 @@
%defattr(-, root, root)
%{_libdir}/libt1.so.*
%{_libdir}/libt1x.so.*
-%dir %config %{_datadir}/t1lib
-%config %{_datadir}/t1lib/t1lib.config
%{_bindir}/type1afm
%{_bindir}/xglyph
@@ -99,12 +97,15 @@
%defattr(-, root, root)
%doc doc/t1lib_doc.pdf
%doc doc/t1_data.eps
-%doc Changes LGPL LICENSE README.t1lib-5.1.1
+%doc Changes LGPL LICENSE README.t1lib-%{version}
%{_libdir}/libt1*.so
%{_includedir}/t1lib*.h
-%exclude %{_libdir}/*.la
%changelog
+* Mon Mar 02 2009 crrodriguez(a)suse.de
+- taking over this package, PHP depends on it.
+- update to version 5.1.2, only obsoletes previuosly added patches
+- merge debian patches
* Thu Sep 20 2007 crrodriguez(a)suse.de
- fix Bug 326687 - VUL-0: t1lib buffer overflow triggerable from PHP scripts.
* Wed Aug 08 2007 crrodriguez(a)suse.de
++++++ t1lib_5.1.2-3.diff.gz ++++++
++++ 1830 lines (skipped)
++++++ t1lib-5.1.1.tar.bz2 -> t1lib-5.1.2.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/Changes new/t1lib-5.1.2/Changes
--- old/t1lib-5.1.1/Changes 2006-12-17 20:02:30.000000000 +0100
+++ new/t1lib-5.1.2/Changes 2007-12-23 16:49:43.000000000 +0100
@@ -892,3 +892,14 @@
- Small number of further fixes, in particular with respect to the build
mechanism.
+
+
+
+December 2007: t1lib-5.1.2:
+---------------------------
+
+- Small number of fixes reported by users. The fixes pertain to a
+ vulnerability issue, memory access issues.
+
+- More decent handling if Encoding and / or FontBBox specification are missing
+ (which is invalid with respect to the specification, but recoverablel).
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/configure new/t1lib-5.1.2/configure
--- old/t1lib-5.1.1/configure 2006-12-17 19:54:49.000000000 +0100
+++ new/t1lib-5.1.2/configure 2007-12-23 16:49:43.000000000 +0100
@@ -1537,16 +1537,15 @@
-
T1LIB_LT_CURRENT=6
-T1LIB_LT_REVISION=1
+T1LIB_LT_REVISION=2
T1LIB_LT_AGE=1
-T1LIB_IDENTIFIER="5.1.1"
+T1LIB_IDENTIFIER="5.1.2"
T1LIB_VERSION=5
T1LIB_REVISION=1
-T1LIB_PATCHLEVEL=1
-T1LIB_VERSIONSTRING=\""5.1.1"\"
+T1LIB_PATCHLEVEL=2
+T1LIB_VERSIONSTRING=\""5.1.2"\"
@@ -5498,7 +5497,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5501 "configure"' > conftest.$ac_ext
+ echo '#line 5500 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6733,7 +6732,7 @@
# Provide some information about the compiler.
-echo "$as_me:6736:" \
+echo "$as_me:6735:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7794,11 +7793,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7797: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7796: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7801: \$? = $ac_status" >&5
+ echo "$as_me:7800: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8037,11 +8036,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8040: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8039: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8044: \$? = $ac_status" >&5
+ echo "$as_me:8043: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -8097,11 +8096,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8100: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8099: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8104: \$? = $ac_status" >&5
+ echo "$as_me:8103: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -10282,7 +10281,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10285 "configure"
+#line 10284 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10380,7 +10379,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10383 "configure"
+#line 10382 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12577,11 +12576,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12580: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12579: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12584: \$? = $ac_status" >&5
+ echo "$as_me:12583: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12637,11 +12636,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12640: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12639: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12644: \$? = $ac_status" >&5
+ echo "$as_me:12643: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13998,7 +13997,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14001 "configure"
+#line 14000 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14096,7 +14095,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 14099 "configure"
+#line 14098 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14933,11 +14932,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14936: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14935: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14940: \$? = $ac_status" >&5
+ echo "$as_me:14939: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14993,11 +14992,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14996: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14995: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15000: \$? = $ac_status" >&5
+ echo "$as_me:14999: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17032,11 +17031,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17035: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17034: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17039: \$? = $ac_status" >&5
+ echo "$as_me:17038: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17275,11 +17274,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17278: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17277: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17282: \$? = $ac_status" >&5
+ echo "$as_me:17281: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17335,11 +17334,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17338: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17337: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17342: \$? = $ac_status" >&5
+ echo "$as_me:17341: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19520,7 +19519,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19523 "configure"
+#line 19522 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19618,7 +19617,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19621 "configure"
+#line 19620 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/configure.in new/t1lib-5.1.2/configure.in
--- old/t1lib-5.1.1/configure.in 2006-12-17 19:54:35.000000000 +0100
+++ new/t1lib-5.1.2/configure.in 2007-12-23 16:49:43.000000000 +0100
@@ -4,7 +4,7 @@
dnl
dnl Author: Rainer Menzner (Rainer.Menzner(a)web.de)
dnl Date: 06/25/1997
-dnl Last Modified: 2006-12-17
+dnl Last Modified: 2007-12-21
dnl
AC_REVISION([configure.in 1.00])
@@ -46,9 +46,8 @@
dnl 6. If any interfaces have been removed since the last public release,
dnl then set AGE to 0.
-
define( MACRO_T1LIB_LT_CURRENT, 6)
-define( MACRO_T1LIB_LT_REVISION, 1)
+define( MACRO_T1LIB_LT_REVISION, 2)
define( MACRO_T1LIB_LT_AGE, 1)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/examples/subset.c new/t1lib-5.1.2/examples/subset.c
--- old/t1lib-5.1.1/examples/subset.c 2005-05-07 23:09:04.000000000 +0200
+++ new/t1lib-5.1.2/examples/subset.c 2007-12-23 16:49:43.000000000 +0100
@@ -1,13 +1,13 @@
/*--------------------------------------------------------------------------
----- File: subset.c
----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
- ----- Date: 2005-05-07
+ ----- Date: 2007-12-22
----- Description: This file is part of t1lib. The program subset reads
a font file name and a string from the commandline
and creates a subset of the font which is sufficient
to display the string. It is an example of how to use
font subsetting.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
/* Note: We include t1lib.h from lib/t1lib. That way the objectfile does only
need to be rebuild when the header itself changes and not each time the
library has been recompiled */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/lib/t1lib/t1aaset.c new/t1lib-5.1.2/lib/t1lib/t1aaset.c
--- old/t1lib-5.1.1/lib/t1lib/t1aaset.c 2006-11-06 22:38:08.000000000 +0100
+++ new/t1lib-5.1.2/lib/t1lib/t1aaset.c 2007-12-23 16:49:42.000000000 +0100
@@ -2,11 +2,11 @@
----- File: t1aaset.c
----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
Subsampling based on code by Raph Levien (raph(a)acm.org)
- ----- Date: 2006-11-06
+ ----- Date: 2007-12-21
----- Description: This file is part of the t1-library. It contains
functions for antialiased setting of characters
and strings of characters.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2006.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -1559,7 +1559,7 @@
-/* Get the current setting of graylevels for 2x antialiasing. The 17
+/* Get the current setting of graylevels for 4x antialiasing. The 17
values are stored at address pgrayvals in order from background to
foreground */
int T1_AAHGetGrayValues( long *pgrayvals)
@@ -1577,14 +1577,14 @@
}
for ( i=0; i<17; i++) { /* bg (i=0) to fg (i=16) */
- pgrayvals[i]=gv[i];
+ pgrayvals[i]=gv_h[i];
}
return( 0);
}
-/* Get the current setting of graylevels for 2x antialiasing. The 2
+/* Get the current setting of graylevels for no antialiasing. The 2
values are stored at address pgrayvals in order from background to
foreground */
int T1_AANGetGrayValues( long *pgrayvals)
@@ -1599,8 +1599,8 @@
T1_errno=T1ERR_INVALID_PARAMETER;
return(-1);
}
- pgrayvals[0]=gv[0]; /* background */
- pgrayvals[1]=gv[1]; /* foreground */
+ pgrayvals[0]=gv_n[0]; /* background */
+ pgrayvals[1]=gv_n[1]; /* foreground */
return( 0);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/lib/t1lib/t1afmtool.c new/t1lib-5.1.2/lib/t1lib/t1afmtool.c
--- old/t1lib-5.1.1/lib/t1lib/t1afmtool.c 2005-05-02 00:05:03.000000000 +0200
+++ new/t1lib-5.1.2/lib/t1lib/t1afmtool.c 2007-12-23 16:49:42.000000000 +0100
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1afmtool.c
----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
- ----- Date: 2005-05-01
+ ----- Date: 2007-12-23
----- Description: This file is part of the t1-library. It contains
functions for generating a fallback set of afm data
from type 1 font files.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -90,6 +90,13 @@
char **charnames;
int nochars=0;
FontInfo *pAFMData;
+
+ /* When generaing fallback info, we accumulate a font bounding box that
+ could be useful when the font's definition is missing or trivial. */
+ int acc_llx=0;
+ int acc_lly=0;
+ int acc_urx=0;
+ int acc_ury=0;
/* We return to this if something goes wrong deep in the rasterizer */
@@ -237,6 +244,21 @@
pAFMData->cmi[i].charBBox.ury =0;
}
pAFMData->cmi[i].ligs=NULL;
+
+ /* Accumulate bounding box of font */
+ if ( pAFMData->cmi[i].charBBox.llx < acc_llx ) {
+ acc_llx=pAFMData->cmi[i].charBBox.llx;
+ }
+ if ( pAFMData->cmi[i].charBBox.lly < acc_lly ) {
+ acc_lly=pAFMData->cmi[i].charBBox.lly;
+ }
+ if ( pAFMData->cmi[i].charBBox.urx > acc_urx ) {
+ acc_urx=pAFMData->cmi[i].charBBox.urx;
+ }
+ if ( pAFMData->cmi[i].charBBox.ury > acc_ury ) {
+ acc_ury=pAFMData->cmi[i].charBBox.ury;
+ }
+
/* We are done with area, so get rid of it. Solves the REALLY
HUGE memory leak */
KillRegion (area);
@@ -247,6 +269,24 @@
nochars, FontID);
T1_PrintLog( "T1_GenerateAFMFallbackInfo()", err_warn_msg_buf,
T1LOG_STATISTIC);
+
+ /* Check whether the bounding box we computed could be better than that
+ specified in the font file itself. Id so, we overwrite it. */
+ if ( pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[0].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[1].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[2].data.integer == 0 &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[3].data.integer == 0 ) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[0].data.integer = acc_llx;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[1].data.integer = acc_lly;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[2].data.integer = acc_urx;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[3].data.integer = acc_ury;
+
+ sprintf( err_warn_msg_buf,
+ "Substituted accumulated FontBBox [%d,%d,%d,%d] for trivial FontBBox of font %d!",
+ acc_llx, acc_lly, acc_urx, acc_ury, FontID);
+ T1_PrintLog( "T1_GenerateAFMFallbackInfo()", err_warn_msg_buf,
+ T1LOG_WARNING);
+ }
/* make sure to free S */
if (S) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/lib/t1lib/t1env.c new/t1lib-5.1.2/lib/t1lib/t1env.c
--- old/t1lib-5.1.1/lib/t1lib/t1env.c 2005-05-18 05:08:27.000000000 +0200
+++ new/t1lib-5.1.2/lib/t1lib/t1env.c 2007-12-23 16:49:42.000000000 +0100
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1env.c
----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
- ----- Date: 2005-05-17
+ ----- Date: 2007-12-22
----- Description: This file is part of the t1-library. It implements
the reading of a configuration file and path-searching
of type1-, afm- and encoding files.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -601,7 +601,7 @@
/* cut a trailing directory separator */
j=strlen(pathbuf);
if (pathbuf[j-1]==DIRECTORY_SEP_CHAR)
- pathbuf[j--]='\0';
+ pathbuf[--j]='\0';
/* Add the directory separator: */
#ifdef VMS
{ char *p= strrchr(pathbuf, DIRECTORY_SEP_CHAR);
@@ -610,7 +610,24 @@
}
#endif
strcat( pathbuf, DIRECTORY_SEP);
- /* And finally the filename: */
+ /* And finally the filename.
+ The following is fix against a vulnerability given by passing in
+ large filenames, cf.:
+
+ http://www.securityfocus.com/bid/25079
+
+ or
+
+ http://packetstormsecurity.nl/0707-advisories/t1lib.txt
+
+ If current pathbuf + StrippedName + 1 byte for NULL is bigger than
+ pathbuf log a warning and try next pathbuf */
+ if ( strlen(pathbuf) + strlen(StrippedName) + 1 > sizeof(pathbuf) ) {
+ T1_PrintLog( "intT1_Env_GetCompletePath()", "Omitting suspicious long candidate path in order to prevent buffer overflow.",
+ T1LOG_WARNING);
+ i++;
+ continue;
+ }
strcat( pathbuf, StrippedName);
/* Check for existence of the path: */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/lib/t1lib/t1lib.h new/t1lib-5.1.2/lib/t1lib/t1lib.h
--- old/t1lib-5.1.1/lib/t1lib/t1lib.h 2006-12-17 19:57:42.000000000 +0100
+++ new/t1lib-5.1.2/lib/t1lib/t1lib.h 2007-12-23 16:49:42.000000000 +0100
@@ -41,8 +41,8 @@
/* Version information filled in by configure */
#define T1LIB_VERSION 5
#define T1LIB_REVISION 1
-#define T1LIB_PATCHLEVEL 1
-#define T1LIB_VERSIONSTRING "5.1.1"
+#define T1LIB_PATCHLEVEL 2
+#define T1LIB_VERSIONSTRING "5.1.2"
/* Data Type information filled in by configure. */
typedef short T1_int16;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/lib/t1lib/t1load.c new/t1lib-5.1.2/lib/t1lib/t1load.c
--- old/t1lib-5.1.1/lib/t1lib/t1load.c 2005-05-02 01:16:05.000000000 +0200
+++ new/t1lib-5.1.2/lib/t1lib/t1load.c 2007-12-23 16:49:42.000000000 +0100
@@ -1,11 +1,11 @@
/*--------------------------------------------------------------------------
----- File: t1load.c
----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
- ----- Date: 2005-05-01
+ ----- Date: 2007-12-23
----- Description: This file is part of the t1-library. It contains
functions for loading fonts and for managing size
dependent data.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2005.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
As of version 0.5, t1lib is distributed under the
GNU General Public Library Lincense. The
conditions can be found in the files LICENSE and
@@ -87,7 +87,7 @@
int T1_LoadFont( int FontID)
{
- int i, j, k, l, m;
+ int i, j, k, l, m, n;
char *FileName, *FileNamePath;
int mode; /* This is used by the type1-library for error reporting */
char *charname;
@@ -160,6 +160,40 @@
free(FileNamePath);
+ /* Set some default for FontBBox and Encoding if the font does not provide
+ correct data. Strictly taken, these fonts do not adhere to the Type1
+ specification. However, it is easy to work around and find reasonable
+ defaults. This solution has been proposed by the Debian community (see
+ http://bugs.debian.org/313236) */
+ /* 1. FontBBox. We set default values of 0 which is recommended by Adobe
+ in cases where the font does not make use of the SEAC primitive. Later on,
+ if AFM fallback info is computed, these settings might be overwritten with
+ meaningful values. */
+ if (pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP == NULL) {
+ if ((pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP =
+ (psobj *)vm_alloc(4 * sizeof(psobj))) == NULL) {
+ T1_PrintLog( "T1_LoadFont()", "Error allocating memory for fontbbox objects (FontID=%d)",
+ T1LOG_ERROR, FontID);
+ T1_errno=T1ERR_ALLOC_MEM;
+ return(-1);
+ }
+ for (n = 0; n < 4; n++) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].type = OBJ_INTEGER;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].len = 0;
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[FONTBBOX].value.data.arrayP[n].data.integer = 0;
+ }
+ T1_PrintLog( "T1_LoadFont()", "Missing FontBBox, adding a trivial one in order to avoid crashes (FontID=%d)",
+ T1LOG_WARNING, FontID);
+ }
+ /* 2. Encoding. In this case, we simply fallback to Standard Encoding. */
+ if (pFontBase->pFontArray[FontID].pFontEnc == NULL &&
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.arrayP == NULL) {
+ pFontBase->pFontArray[FontID].pType1Data->fontInfoP[ENCODING].value.data.valueP = (char *) StdEncArrayP;
+ T1_PrintLog( "T1_LoadFont()", "Missing, invalid or undefined Encoding, setting up Standard Encoding in order to avoid crashes (FontID=%d)",
+ T1LOG_WARNING, FontID);
+ }
+
+
/* Store the base address of virtual memory and realloc in order not
to waste too much memory: */
pFontBase->pFontArray[FontID].vm_base=vm_base;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/README.t1lib-5.1.1 new/t1lib-5.1.2/README.t1lib-5.1.1
--- old/t1lib-5.1.1/README.t1lib-5.1.1 2006-12-17 20:03:08.000000000 +0100
+++ new/t1lib-5.1.2/README.t1lib-5.1.1 1970-01-01 01:00:00.000000000 +0100
@@ -1,223 +0,0 @@
-
- --------------------------------------------------------------------------
- --------------------------- t1lib-README ---------------------------------
- --------------------------------------------------------------------------
-
-/*--------------------------------------------------------------------------
- ----- File: REAMDE.t1lib-5.1.1
- ----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
- ----- Date: 2006-12-17
- ----- Description: This is file README.t1lib of the t1lib-package. It
- contains an overview and brief installation
- instructions for the t1-library.
- ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2006.
- As of version 0.5, t1lib is distributed under the
- GNU General Public Library License. The
- conditions can be found in the files LICENSE and
- LGPL, which should reside in the toplevel
- directory of the distribution. Please note that
- there are parts of t1lib that are subject to
- other licenses:
- The parseAFM-package is copyrighted by Adobe Systems
- Inc.
- The type1 rasterizer is copyrighted by IBM and the
- X11-consortium.
- ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
- ----- Credits: I want to thank IBM and the X11-consortium for making
- their rasterizer freely available.
- Also thanks to Piet Tutelaers for his ps2pk, from
- which I took the rasterizer sources in a format
- independent from X11.
- Thanks to all people who make free software living!
---------------------------------------------------------------------------*/
-
-
-
-About t1lib:
-------------
-
-t1lib is a library distributed under the GNU General Public Library
-License for generating character- and string-glyphs from Adobe Type 1
-fonts under UNIX. t1lib uses most of the code of the X11 rasterizer
-donated by IBM to the X11-project. But some disadvantages of the
-rasterizer being included in X11 have been eliminated. Here are some
-of the features:
-
-- t1lib is completely independent of X11 (although the program
- provided for testing the library needs X11)
-
-- fonts are made known to library by means of a font database file at
- runtime
-
-- searchpaths for all types of input files are configured by means
- of a configuration file at runtime
-
-- characters are rastered as they are needed
-
-- characters and complete strings may be rastered by a simple function
- call
-
-- when rastering strings, pairwise kerning information from .afm-files
- may optionally be taken into account
-
-- an interface to ligature-information of afm-files is provided
-
-- a program to generate afm-files from Type 1 font files is included
-
-- rotation and arbitrary transformations are supported
-
-- there's support for extending and slanting fonts
-
-- underlining, overlining and overstriking is supported
-
-- new encoding vectors may be loaded at runtime and fonts may be
- reencoded using these encoding vectors
-
-- antialiasing is implemented
-
-- Right-To-Left typesetting is supported
-
-- Font subsetting is easily possible
-
-- support of composite character information
-
-- stroking of character outlines with variable strokewidths
-
-- An interactive test program called "xglyph" is included in the
- distribution. This program allows to test all of the features of the
- library. It requires X11.
-
-
-
-Changes and New Features:
--------------------------
-
-- See the file Changes in the T1Lib top-directory for information on new
- features.
-
-
-
-Installation:
--------------
-
------------------------------------------------------------------------------
-Note: VMS-users should examine configure.com in the toplevel directory, which
- is a configure-script for VMS, kindly contributed by John Hasstedt
- and now maintained by Martin Zinser.
- This file contains notes on how to compile t1lib on VMS.
------------------------------------------------------------------------------
-
-
-After unpacking the archive (what you obviously did already), change
-to subdirectory t1lib-..../ and type:
-
- ./configure
-
-This will create the Makefiles. Then type
-
- make
-
-
-In order to use the testprogram xglyph, X11 needs to be installed on your
-system.
-
-If you have difficulties during configuring and building t1lib, cd to
-directory t1lib-.../doc and execute
-
- $ latex t1lib_doc.tex
- $ makeindex t1lib_doc
- $ latex t1lib_doc.tex
- $ latex t1lib_doc.tex
-
-This will generate the docs which contain a more detailed description
-of the build-process. LaTeX2e is required. Alternatively, you can scan the
-preformatted pdf-documentation.
-
-
-Before installing the libraries, you should test whether all things
-work correct:
-
-1) Change to subdirectory xglyph
-
-2) Start the program xglyph
-
-3) Ensure that the output-window is not hidden behind another window.
-
-4) Before doing anything other, click on button "String". The
- string "Test" should now be rastered and displayed in the
- output-window, using font BitstreamCharterBTRoman at 100bp without
- kerning. If that works, most probably all works for you.
-
-5) Have a look at t1lib_doc.dvi in the doc-subdirectory of the package
- and read the chapter on xglyph. However, most of this program is
- self-explaining, so that you might want to omit this step.
-
-6) Play with the program and enjoy.
-
-7) If you do not have X11, you can still check whether t1lib works for
- you. Copy one of the pfb-files from t1lib-.../Fonts/type1, say,
- bchr.pfb, to the type1afm-subdirectory, and run
-
- type1afm bchr.pfb
-
- If the afm-file bchr.afm is generated, t1lib will most probably
- work on your system.
-
-
-
-Documentation:
---------------
-
-As mentioned above, documentation is provided in LaTeX2e-format
-subdirectory T1Lib/doc. It should have been built during the build.
-The section on runtime setup is really important,
-because programs may fail due to an invalid or incomplete runtime
-setup, although the programs itself may be correct!
-A preformatted Version is also available in pdf.
-
-
-
-How to get it:
---------------
-
-t1lib is available at
-
-ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-x.y[.z].tar.gz
-
-where x.y[.z] is the version identification.
-
-
-
-Closing:
---------
-
-You are allowed to send the author lots of money and dozents of gifts,
-but you needn't :-)
-If you have any comments to this library, feedback is wanted. Send
-eMail to:
-
-Rainer.Menzner(a)web.de
-
-
-
-Future:
--------
-
-Within the past years, my time has constantly and increasingly become spare so
-that I hardly found time to further develop t1lib. And developing free
-software is undoubtedly related to a certain amount of fun, which in turn only
-can come up if you are relaxed with respect to time ...
-
-Since t1lib now has reached a reasonably stable state, I intend to more or
-less freeze the development of new features at this point. Of course, bug
-fixes etc. should be possible further.
-
-If there is somebody out there willing to further develop t1lib, he or she is
-welcome to contact me ...
-
-
-
-Have fun,
-
- -Rainer
-
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/t1lib-5.1.1/README.t1lib-5.1.2 new/t1lib-5.1.2/README.t1lib-5.1.2
--- old/t1lib-5.1.1/README.t1lib-5.1.2 1970-01-01 01:00:00.000000000 +0100
+++ new/t1lib-5.1.2/README.t1lib-5.1.2 2007-12-23 16:49:43.000000000 +0100
@@ -0,0 +1,223 @@
+
+ --------------------------------------------------------------------------
+ --------------------------- t1lib-README ---------------------------------
+ --------------------------------------------------------------------------
+
+/*--------------------------------------------------------------------------
+ ----- File: REAMDE.t1lib-5.1.2
+ ----- Author: Rainer Menzner (Rainer.Menzner(a)web.de)
+ ----- Date: 2007-12-23
+ ----- Description: This is file README.t1lib of the t1lib-package. It
+ contains an overview and brief installation
+ instructions for the t1-library.
+ ----- Copyright: t1lib is copyrighted (c) Rainer Menzner, 1996-2007.
+ As of version 0.5, t1lib is distributed under the
+ GNU General Public Library License. The
+ conditions can be found in the files LICENSE and
+ LGPL, which should reside in the toplevel
+ directory of the distribution. Please note that
+ there are parts of t1lib that are subject to
+ other licenses:
+ The parseAFM-package is copyrighted by Adobe Systems
+ Inc.
+ The type1 rasterizer is copyrighted by IBM and the
+ X11-consortium.
+ ----- Warranties: Of course, there's NO WARRANTY OF ANY KIND :-)
+ ----- Credits: I want to thank IBM and the X11-consortium for making
+ their rasterizer freely available.
+ Also thanks to Piet Tutelaers for his ps2pk, from
+ which I took the rasterizer sources in a format
+ independent from X11.
+ Thanks to all people who make free software living!
+--------------------------------------------------------------------------*/
+
+
+
+About t1lib:
+------------
+
+t1lib is a library distributed under the GNU General Public Library
+License for generating character- and string-glyphs from Adobe Type 1
+fonts under UNIX. t1lib uses most of the code of the X11 rasterizer
+donated by IBM to the X11-project. But some disadvantages of the
+rasterizer being included in X11 have been eliminated. Here are some
+of the features:
+
+- t1lib is completely independent of X11 (although the program
+ provided for testing the library needs X11)
+
+- fonts are made known to library by means of a font database file at
+ runtime
+
+- searchpaths for all types of input files are configured by means
+ of a configuration file at runtime
+
+- characters are rastered as they are needed
+
+- characters and complete strings may be rastered by a simple function
+ call
+
+- when rastering strings, pairwise kerning information from .afm-files
+ may optionally be taken into account
+
+- an interface to ligature-information of afm-files is provided
+
+- a program to generate afm-files from Type 1 font files is included
+
+- rotation and arbitrary transformations are supported
+
+- there's support for extending and slanting fonts
+
+- underlining, overlining and overstriking is supported
+
+- new encoding vectors may be loaded at runtime and fonts may be
+ reencoded using these encoding vectors
+
+- antialiasing is implemented
+
+- Right-To-Left typesetting is supported
+
+- Font subsetting is easily possible
+
+- support of composite character information
+
+- stroking of character outlines with variable strokewidths
+
+- An interactive test program called "xglyph" is included in the
+ distribution. This program allows to test all of the features of the
+ library. It requires X11.
+
+
+
+Changes and New Features:
+-------------------------
+
+- See the file Changes in the T1Lib top-directory for information on new
+ features.
+
+
+
+Installation:
+-------------
+
+-----------------------------------------------------------------------------
+Note: VMS-users should examine configure.com in the toplevel directory, which
+ is a configure-script for VMS, kindly contributed by John Hasstedt
+ and now maintained by Martin Zinser.
+ This file contains notes on how to compile t1lib on VMS.
+-----------------------------------------------------------------------------
+
+
+After unpacking the archive (what you obviously did already), change
+to subdirectory t1lib-..../ and type:
+
+ ./configure
+
+This will create the Makefiles. Then type
+
+ make
+
+
+In order to use the testprogram xglyph, X11 needs to be installed on your
+system.
+
+If you have difficulties during configuring and building t1lib, cd to
+directory t1lib-.../doc and execute
+
+ $ latex t1lib_doc.tex
+ $ makeindex t1lib_doc
+ $ latex t1lib_doc.tex
+ $ latex t1lib_doc.tex
+
+This will generate the docs which contain a more detailed description
+of the build-process. LaTeX2e is required. Alternatively, you can scan the
+preformatted pdf-documentation.
+
+
+Before installing the libraries, you should test whether all things
+work correct:
+
+1) Change to subdirectory xglyph
+
+2) Start the program xglyph
+
+3) Ensure that the output-window is not hidden behind another window.
+
+4) Before doing anything other, click on button "String". The
+ string "Test" should now be rastered and displayed in the
+ output-window, using font BitstreamCharterBTRoman at 100bp without
+ kerning. If that works, most probably all works for you.
+
+5) Have a look at t1lib_doc.dvi in the doc-subdirectory of the package
+ and read the chapter on xglyph. However, most of this program is
+ self-explaining, so that you might want to omit this step.
+
+6) Play with the program and enjoy.
+
+7) If you do not have X11, you can still check whether t1lib works for
+ you. Copy one of the pfb-files from t1lib-.../Fonts/type1, say,
+ bchr.pfb, to the type1afm-subdirectory, and run
+
+ type1afm bchr.pfb
+
+ If the afm-file bchr.afm is generated, t1lib will most probably
+ work on your system.
+
+
+
+Documentation:
+--------------
+
+As mentioned above, documentation is provided in LaTeX2e-format
+subdirectory T1Lib/doc. It should have been built during the build.
+The section on runtime setup is really important,
+because programs may fail due to an invalid or incomplete runtime
+setup, although the programs itself may be correct!
+A preformatted Version is also available in pdf.
+
+
+
+How to get it:
+--------------
+
+t1lib is available at
+
+ftp://sunsite.unc.edu/pub/Linux/libs/graphics/t1lib-x.y[.z].tar.gz
+
+where x.y[.z] is the version identification.
+
+
+
+Closing:
+--------
+
+You are allowed to send the author lots of money and dozents of gifts,
+but you needn't :-)
+If you have any comments to this library, feedback is wanted. Send
+eMail to:
+
+Rainer.Menzner(a)web.de
+
+
+
+Future:
+-------
+
+Within the past years, my time has constantly and increasingly become spare so
+that I hardly found time to further develop t1lib. And developing free
+software is undoubtedly related to a certain amount of fun, which in turn only
+can come up if you are relaxed with respect to time ...
+
+Since t1lib now has reached a reasonably stable state, I intend to more or
+less freeze the development of new features at this point. Of course, bug
+fixes etc. should be possible further.
+
+If there is somebody out there willing to further develop t1lib, he or she is
+welcome to contact me ...
+
+
+
+Have fun,
+
+ -Rainer
+
Files old/t1lib-5.1.1/xglyph/bchr.pfb and new/t1lib-5.1.2/xglyph/bchr.pfb differ
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-libXext for openSUSE:Factory
checked in at Mon Mar 2 01:17:22 CET 2009.
--------
--- xorg-x11-libXext/xorg-x11-libXext.changes 2008-09-11 14:21:33.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libXext/xorg-x11-libXext.changes 2009-03-01 20:56:15.972859736 +0100
@@ -1,0 +2,5 @@
+Sun Mar 1 20:55:57 CET 2009 - sndirsch(a)suse.de
+
+- libXext 1.0.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
libXext-1.0.4.tar.bz2
New:
----
libXext-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libXext.spec ++++++
--- /var/tmp/diff_new_pack.W16259/_old 2009-03-02 01:17:13.000000000 +0100
+++ /var/tmp/diff_new_pack.W16259/_new 2009-03-02 01:17:13.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-libXext (Version 7.4)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: xorg-x11-libXext
-%define dirsuffix 1.0.4
+%define dirsuffix 1.0.5
BuildRequires: pkgconfig xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 1
+Release: 4
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -138,6 +138,8 @@
%{_mandir}/man3/*
%changelog
+* Sun Mar 01 2009 sndirsch(a)suse.de
+- libXext 1.0.5
* Thu Sep 11 2008 sndirsch(a)suse.de
- bumped release number to 7.4
* Thu Apr 10 2008 ro(a)suse.de
++++++ libXext-1.0.4.tar.bz2 -> libXext-1.0.5.tar.bz2 ++++++
++++ 62730 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/libXext-1.0.4/autogen.sh new/libXext-1.0.5/autogen.sh
--- old/libXext-1.0.4/autogen.sh 2006-07-11 20:05:14.000000000 +0200
+++ new/libXext-1.0.5/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
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/libXext-1.0.4/ChangeLog new/libXext-1.0.5/ChangeLog
--- old/libXext-1.0.4/ChangeLog 2008-02-29 04:03:40.000000000 +0100
+++ new/libXext-1.0.5/ChangeLog 2009-01-29 23:40:02.000000000 +0100
@@ -1,3 +1,64 @@
+commit f7b69edc21b90a5b343115de55d6f1a98aeda5e2
+Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br>
+Date: Thu Jan 29 20:38:22 2009 -0200
+
+ Xorg libXext Version 1.0.5.
+
+commit 52cf9c06819d94e178285d75de6434e98358b63d
+Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br>
+Date: Thu Jan 29 17:02:46 2009 -0200
+
+ patch to avoid gcc warning in libXext
+
+ Original patch author is Peter Breitenlohner <peb(a)mppmu.mpg.de>.
+ This closes bug #18038.
+
+commit a2e8bc500dfad18ab161b3a7be44cf6fa15f140f
+Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br>
+Date: Thu Jan 29 16:33:40 2009 -0200
+
+ Janitor: Correct make distcheck and compiler warnings.
+
+commit f467d17ae5a89aa1a2b8c7260334f41e8ee2d08c
+Author: Kim Woelders <kim(a)woelders.dk>
+Date: Fri Oct 17 16:53:29 2008 -0400
+
+ Bug #17774: Allocate the right size in XSyncListSystemCounters.
+
+commit 49563f5d76637e2ca28fe0b91ce3114271c0955d
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Thu May 29 10:55:49 2008 +0930
+
+ Bump to 1.0.99.1
+
+commit 64edd246587adb59ac71031f72955fa5a73ac467
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Thu May 29 10:40:59 2008 +0930
+
+ Require xproto 7.0.13, xextproto 7.0.3 and xlib 1.1.99.1.
+
+commit 0721b2d71c40e877944aa22a3c57ed70225f508d
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Mon May 26 23:16:29 2008 +0930
+
+ Xge: Replace XExtensionVersion with XGEVersionRec.
+
+ XExtensionVersion is defined in XInput.h, leading to a circular dependency.
+ Thanks to Jens Stroebel for pointing this out.
+
+commit 44d3a4d4016c58f8ac46843d0b2dd4ddb26e2fc9
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Tue May 13 11:23:59 2008 +0930
+
+ Xge: replace copyright with standard template from xserver, whitespace fixes.
+
+commit 7e0b3b9029d3d12c9edf961c1d9db4cdbf021f1d
+Merge: c4b0ae9... 9884a41...
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Mon May 12 18:04:09 2008 +0930
+
+ Merge branch 'master' into xge
+
commit 9884a41dd0282ca3dd19db5bf3a11554ee7eee57
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Thu Feb 28 19:02:58 2008 -0800
@@ -25,6 +86,13 @@
Add missing PHONY line for automatic ChangeLog generation
+commit c4b0ae960d63f461d6e9efd64f70084f06a674b3
+Merge: d1c9350... 249daf0...
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Thu Dec 6 14:23:02 2007 +1030
+
+ Merge branch 'master' into xge
+
commit 249daf0d8a044a97d053c957ab45445c159d31e4
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Wed Nov 28 17:29:28 2007 -0800
@@ -72,6 +140,38 @@
Fix typos in source comments
+commit d1c93500e2f56b8aefda7133848c21f62572f5d5
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Tue Jun 26 11:46:10 2007 +0930
+
+ Don't call _xgeCheckExtInit() from _xgeWireToEvent(). It will cause a SIGABRT
+ when trying to get the display lock.
+
+commit 40d1cbaaf0fd12883c048288a62b0088286463f4
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Wed Jun 13 16:26:03 2007 +0930
+
+ Lock/Unlock in _xgeCheckExtInit(), and not in xgeGetExtensionVersion().
+ Otherwise we get a SIGABRT for displays that don't have XGE when we try to get
+ the disply lock.
+
+commit b125890386d5ebbc3811bc67e0a1ad469b0a10ed
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Wed May 30 11:07:25 2007 +0930
+
+ Remove useless line in XGE that didn't do anything except segfaulting.
+
+ Thanks to Paulo Zanoni for spotting it.
+
+commit 850263ac9f772ab80f3e0680997f00e0c566f7d4
+Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
+Date: Tue May 15 17:00:07 2007 +0930
+
+ Add GenericEvent extension (XGE).
+
+ Automatically register any extension at XGE and relay events to
+ the extension's event handlers.
+
commit 8d8a6ac4012c2bd5bfd037e42f69f5b2b111433d
Author: Alan Coopersmith <alan.coopersmith(a)sun.com>
Date: Thu Jan 25 18:28:21 2007 -0800
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/libXext-1.0.4/config.h.in new/libXext-1.0.5/config.h.in
--- old/libXext-1.0.4/config.h.in 2008-02-29 04:03:16.000000000 +0100
+++ new/libXext-1.0.5/config.h.in 2009-01-29 23:40:02.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
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/libXext-1.0.4/configure.ac new/libXext-1.0.5/configure.ac
--- old/libXext-1.0.4/configure.ac 2008-02-29 04:02:40.000000000 +0100
+++ new/libXext-1.0.5/configure.ac 2009-01-29 23:37:37.000000000 +0100
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libXext],
- 1.0.4,
+ 1.0.5,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
libXext)
@@ -12,12 +12,11 @@
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG, XORG_WITH_LINT
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
AM_CONFIG_HEADER([config.h])
-# Require xorg-macros version 1.1.0 or newer for XORG_WITH_LINT macro
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.1 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.1)
-
# Determine .so library version per platform
# based on SharedXextRev in monolith xc/config/cf/*Lib.tmpl
AC_CANONICAL_HOST
@@ -33,9 +32,11 @@
# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC
+XORG_CWARNFLAGS
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XEXT, xproto x11 xextproto xau)
+PKG_CHECK_MODULES(XEXT, [xproto >= 7.0.13] [x11 >= 1.1.99.1] [xextproto >= 7.0.5] xau)
+XEXT_CFLAGS="$CWARNFLAGS $XEXT_CFLAGS"
AC_SUBST(XEXT_CFLAGS)
AC_SUBST(XEXT_LIBS)
@@ -46,6 +47,7 @@
XORG_CHECK_MALLOC_ZERO
XORG_RELEASE_VERSION
+XORG_CHANGELOG
# Man page processing requirements
XORG_PROG_RAWCPP
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/libXext-1.0.4/Makefile.am new/libXext-1.0.5/Makefile.am
--- old/libXext-1.0.4/Makefile.am 2007-12-08 00:42:48.000000000 +0100
+++ new/libXext-1.0.5/Makefile.am 2009-01-29 18:59:34.000000000 +0100
@@ -3,13 +3,13 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xext.pc
-EXTRA_DIST=xext.pc.in ChangeLog autogen.sh
+EXTRA_DIST=xext.pc.in ChangeLog
MAINTAINERCLEANFILES=ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
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/libXext-1.0.4/src/extutil.c new/libXext-1.0.5/src/extutil.c
--- old/libXext-1.0.4/src/extutil.c 2007-11-28 01:46:14.000000000 +0100
+++ new/libXext-1.0.5/src/extutil.c 2009-01-29 19:47:55.000000000 +0100
@@ -54,7 +54,11 @@
#include <X11/Xlibint.h>
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
+#include <X11/extensions/ge.h>
+/* defined in Xge.c */
+extern Bool
+xgeExtRegister(Display* dpy, int extension, XExtensionHooks* callbacks);
/*
* XextCreateExtension - return an extension descriptor containing context
@@ -118,6 +122,11 @@
XESetWireToEvent (dpy, j, hooks->wire_to_event);
XESetEventToWire (dpy, j, hooks->event_to_wire);
}
+
+ /* register extension for XGE */
+ if (strcmp(ext_name, GE_NAME))
+ xgeExtRegister(dpy, dpyinfo->codes->major_opcode, hooks);
+
if (hooks->create_gc)
XESetCreateGC (dpy, dpyinfo->codes->extension, hooks->create_gc);
if (hooks->copy_gc)
@@ -235,7 +244,7 @@
-static int _default_exterror (Display *dpy, char *ext_name, char *reason)
+static int _default_exterror (Display *dpy, _Xconst char *ext_name, _Xconst char *reason)
{
fprintf (stderr, "Xlib: extension \"%s\" %s on display \"%s\".\n",
ext_name, reason, DisplayString(dpy));
@@ -248,11 +257,11 @@
* requested extension is referenced. This should eventually move into Xlib.
*/
-extern int (*_XExtensionErrorFunction)(Display*, char *, char * );
+extern XextErrorHandler _XExtensionErrorFunction;
-int (*XSetExtensionErrorHandler(int (*handler)(Display*, char *, char * )))(Display*, char *, char * )
+XextErrorHandler XSetExtensionErrorHandler (XextErrorHandler handler)
{
- int (*oldhandler)(Display*, char *, char * ) = _XExtensionErrorFunction;
+ XextErrorHandler oldhandler = _XExtensionErrorFunction;
_XExtensionErrorFunction = (handler ? handler :
_default_exterror);
@@ -265,8 +274,8 @@
*/
int XMissingExtension (Display *dpy, _Xconst char *ext_name)
{
- int (*func)(Display*, char *, char *) = (_XExtensionErrorFunction ?
- _XExtensionErrorFunction : _default_exterror);
+ XextErrorHandler func = (_XExtensionErrorFunction ?
+ _XExtensionErrorFunction : _default_exterror);
if (!ext_name) ext_name = X_EXTENSION_UNKNOWN;
return (*func) (dpy, ext_name, X_EXTENSION_MISSING);
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/libXext-1.0.4/src/globals.c new/libXext-1.0.5/src/globals.c
--- old/libXext-1.0.4/src/globals.c 2007-11-28 01:47:48.000000000 +0100
+++ new/libXext-1.0.5/src/globals.c 2009-01-29 19:48:19.000000000 +0100
@@ -75,8 +75,7 @@
/*
* Error handlers; used to be in XlibInt.c
*/
-typedef int (*funcptr)(Display*, char *, char *);
-ZEROINIT (funcptr, _XExtensionErrorFunction, NULL);
+ZEROINIT (XextErrorHandler, _XExtensionErrorFunction, NULL);
/*
* NOTE: any additional external definition NEED
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/libXext-1.0.4/src/Makefile.am new/libXext-1.0.5/src/Makefile.am
--- old/libXext-1.0.4/src/Makefile.am 2007-11-28 02:31:56.000000000 +0100
+++ new/libXext-1.0.5/src/Makefile.am 2008-12-03 20:02:05.000000000 +0100
@@ -20,6 +20,7 @@
XTestExt1.c \
Xcup.c \
Xdbe.c \
+ Xge.c \
extutil.c \
globals.c
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/libXext-1.0.4/src/Xge.c new/libXext-1.0.5/src/Xge.c
--- old/libXext-1.0.4/src/Xge.c 1970-01-01 01:00:00.000000000 +0100
+++ new/libXext-1.0.5/src/Xge.c 2008-12-03 20:02:05.000000000 +0100
@@ -0,0 +1,369 @@
+/*
+ * Copyright � 2007-2008 Peter Hutterer
+ *
+ * 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.
+ *
+ * Authors: Peter Hutterer, University of South Australia, NICTA
+ */
+
+/*
+ * XGE is an extension to re-use a single opcode for multiple events,
+ * depending on the extension. XGE allows events >32 bytes.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#define NEED_EVENTS
+#define NEED_REPLIES
+
+#include <stdio.h>
+#include <X11/extensions/geproto.h>
+#include <X11/extensions/ge.h>
+#include <X11/Xlibint.h>
+#include <X11/extensions/extutil.h>
+#include <X11/extensions/Xge.h>
+
+/***********************************************************************/
+/* internal data structures */
+/***********************************************************************/
+
+typedef struct {
+ int present;
+ short major_version;
+ short minor_version;
+} XGEVersionRec;
+
+/* NULL terminated list of registered extensions. */
+typedef struct _XGEExtNode {
+ int extension;
+ XExtensionHooks* hooks;
+ struct _XGEExtNode* next;
+} XGEExtNode, *XGEExtList;
+
+/* Internal data for GE extension */
+typedef struct _XGEData {
+ XEvent data;
+ XGEVersionRec *vers;
+ XGEExtList extensions;
+} XGEData;
+
+
+/* forward declarations */
+extern XExtDisplayInfo* _xgeFindDisplay(Display*);
+static Bool _xgeWireToEvent(Display*, XEvent*, xEvent*);
+Status _xgeEventToWire(Display*, XEvent*, xEvent*);
+static int _xgeDpyClose(Display*, XExtCodes*);
+static XGEVersionRec* _xgeGetExtensionVersion(Display*,
+ _Xconst char*,
+ XExtDisplayInfo*);
+static Bool _xgeCheckExtension(Display* dpy, XExtDisplayInfo* info);
+
+/* main extension information data */
+static XExtensionInfo *xge_info;
+static char xge_extension_name[] = GE_NAME;
+static XExtensionHooks xge_extension_hooks = {
+ NULL, /* create_gc */
+ NULL, /* copy_gc */
+ NULL, /* flush_gc */
+ NULL, /* free_gc */
+ NULL, /* create_font */
+ NULL, /* free_font */
+ _xgeDpyClose, /* close_display */
+ _xgeWireToEvent, /* wire_to_event */
+ _xgeEventToWire, /* event_to_wire */
+ NULL, /* error */
+ NULL, /* error_string */
+};
+
+
+XExtDisplayInfo *_xgeFindDisplay(Display *dpy)
+{
+ XExtDisplayInfo *dpyinfo;
+ if (!xge_info)
+ {
+ if (!(xge_info = XextCreateExtension()))
+ return NULL;
+ }
+ if (!(dpyinfo = XextFindDisplay (xge_info, dpy)))
+ {
+ dpyinfo = XextAddDisplay (xge_info,
+ dpy,
+ xge_extension_name,
+ &xge_extension_hooks,
+ 0 /* no events, see below */,
+ NULL);
+ /* We don't use an extension opcode, so we have to set the handlers
+ * directly. If GenericEvent would be > 64, the job would be done by
+ * XExtAddDisplay */
+ XESetWireToEvent (dpy,
+ GenericEvent,
+ xge_extension_hooks.wire_to_event);
+ XESetEventToWire (dpy,
+ GenericEvent,
+ xge_extension_hooks.event_to_wire);
+ }
+ return dpyinfo;
+}
+
+/*
+ * Check extension is set up and internal data fields are filled.
+ */
+Bool
+_xgeCheckExtInit(Display* dpy, XExtDisplayInfo* info)
+{
+ LockDisplay(dpy);
+ if(!_xgeCheckExtension(dpy, info))
+ {
+ goto cleanup;
+ }
+
+ if (!info->data)
+ {
+ XGEData* data = (XGEData*)Xmalloc(sizeof(XGEData));
+ if (!data) {
+ goto cleanup;
+ }
+ /* get version from server */
+ data->vers =
+ _xgeGetExtensionVersion(dpy, "Generic Event Extension", info);
+ data->extensions = NULL;
+ info->data = (XPointer)data;
+ }
+
+ UnlockDisplay(dpy);
+ return True;
+
+cleanup:
+ UnlockDisplay(dpy);
+ return False;
+}
+
+/* Return 1 if XGE extension exists, 0 otherwise. */
+static Bool
+_xgeCheckExtension(Display* dpy, XExtDisplayInfo* info)
+{
+ XextCheckExtension(dpy, info, xge_extension_name, False);
+ return True;
+}
+
+
+/* Retrieve XGE version number from server. */
+static XGEVersionRec*
+_xgeGetExtensionVersion(Display* dpy,
+ _Xconst char* name,
+ XExtDisplayInfo*info)
+{
+ xGEQueryVersionReply rep;
+ xGEQueryVersionReq *req;
+ XGEVersionRec *vers;
+
+ GetReq(GEQueryVersion, req);
+ req->reqType = info->codes->major_opcode;
+ req->ReqType = X_GEQueryVersion;
+ req->majorVersion = GE_MAJOR;
+ req->minorVersion = GE_MINOR;
+
+ if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
+ {
+ Xfree(info);
+ return NULL;
+ }
+
+ vers = (XGEVersionRec*)Xmalloc(sizeof(XGEVersionRec));
+ vers->major_version = rep.majorVersion;
+ vers->minor_version = rep.minorVersion;
+ return vers;
+}
+
+/*
+ * Display closing routine.
+ */
+
+static int
+_xgeDpyClose(Display* dpy, XExtCodes* codes)
+{
+ XExtDisplayInfo *info = _xgeFindDisplay(dpy);
+
+ if (info->data != NULL) {
+ XGEData* xge_data = (XGEData*)info->data;
+
+ if (xge_data->extensions)
+ {
+ XGEExtList current, next;
+ current = xge_data->extensions;
+ while(current)
+ {
+ next = current->next;
+ Xfree(current);
+ current = next;
+ }
+ }
+
+ XFree(xge_data->vers);
+ XFree(xge_data);
+ }
+
+ return XextRemoveDisplay(xge_info, dpy);
+}
+
+/*
+ * protocol to Xlib event conversion routine.
+ */
+static Bool
+_xgeWireToEvent(Display* dpy, XEvent* re, xEvent *event)
+{
+ int extension;
+ XGEExtList it;
+ XExtDisplayInfo* info = _xgeFindDisplay(dpy);
+ if (!info)
+ return False;
+ /*
+ _xgeCheckExtInit() calls LockDisplay, leading to a SIGABRT.
+ Well, I guess we don't need the data we get in CheckExtInit anyway
+ if (!_xgeCheckExtInit(dpy, info))
+ return False;
+ */
+
+ extension = ((xGenericEvent*)event)->extension;
+
+ it = ((XGEData*)info->data)->extensions;
+ while(it)
+ {
+ if (it->extension == extension)
+ {
+ return (it->hooks->wire_to_event(dpy, re, event));
+ }
+ it = it->next;
+ }
+
+ fprintf(stderr,
+ "_xgeWireToEvent: Unknown extension %d, this should never happen.\n",
+ extension);
+ return False;
+}
+
+/*
+ * xlib event to protocol conversion routine.
+ */
+Status
+_xgeEventToWire(Display* dpy, XEvent* re, xEvent* event)
+{
+ int extension;
+ XGEExtList it;
+ XExtDisplayInfo* info = _xgeFindDisplay(dpy);
+ if (!info)
+ return 1; /* error! */
+
+ extension = ((XGenericEvent*)re)->extension;
+
+ it = ((XGEData*)info->data)->extensions;
+ while(it)
+ {
+ if (it->extension == extension)
+ {
+ return (it->hooks->event_to_wire(dpy, re, event));
+ }
+ it = it->next;
+ }
+
+ fprintf(stderr,
+ "_xgeEventToWire: Unknown extension %d, this should never happen.\n",
+ extension);
+
+ return Success;
+}
+
+/*
+ * Extensions need to register callbacks for their events.
+ */
+Bool
+xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)
+{
+ XGEExtNode* newExt;
+ XGEData* xge_data;
+
+ XExtDisplayInfo* info = _xgeFindDisplay(dpy);
+ if (!info)
+ return False; /* error! */
+
+ if (!_xgeCheckExtInit(dpy, info))
+ return False;
+
+ xge_data = (XGEData*)info->data;
+
+ newExt = (XGEExtNode*)Xmalloc(sizeof(XGEExtNode));
+ if (!newExt)
+ {
+ fprintf(stderr, "xgeExtRegister: Failed to alloc memory.\n");
+ return False;
+ }
+
+ newExt->extension = offset;
+ newExt->hooks = callbacks;
+ newExt->next = xge_data->extensions;
+ xge_data->extensions = newExt;
+
+ return True;
+}
+
+/***********************************************************************/
+/* Client interfaces */
+/***********************************************************************/
+
+/* Set event_base and error_base to the matching values for XGE.
+ * Note that since XGE doesn't use any errors and events, the actual return
+ * value is of limited use.
+ */
+Bool
+XGEQueryExtension(Display* dpy, int* event_base, int* error_base)
+{
+ XExtDisplayInfo* info = _xgeFindDisplay(dpy);
+ if (!_xgeCheckExtInit(dpy, info))
+ return False;
+
+ *event_base = info->codes->first_event;
+ *error_base = info->codes->first_error;
+ return True;
+}
+
+/* Get XGE version number.
+ * Doesn't actually get it from server, that should have been done beforehand
+ * already
+ */
+Bool
+XGEQueryVersion(Display* dpy,
+ int *major_version,
+ int *minor_version)
+{
+ XExtDisplayInfo* info = _xgeFindDisplay(dpy);
+ if (!info)
+ return False;
+
+ if (!_xgeCheckExtInit(dpy, info))
+ return False;
+
+ *major_version = ((XGEData*)info->data)->vers->major_version;
+ *minor_version = ((XGEData*)info->data)->vers->minor_version;
+
+ return True;
+}
+
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/libXext-1.0.4/src/XMultibuf.c new/libXext-1.0.5/src/XMultibuf.c
--- old/libXext-1.0.4/src/XMultibuf.c 2007-11-28 00:48:11.000000000 +0100
+++ new/libXext-1.0.5/src/XMultibuf.c 2009-01-29 19:03:40.000000000 +0100
@@ -634,7 +634,7 @@
req->borderWidth = border_width;
req->depth = depth;
req->class = class;
- if (visual == CopyFromParent)
+ if (visual == (Visual *)CopyFromParent)
req->visual = CopyFromParent;
else
req->visual = visual->visualid;
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/libXext-1.0.4/src/XSync.c new/libXext-1.0.5/src/XSync.c
--- old/libXext-1.0.4/src/XSync.c 2006-07-11 20:05:14.000000000 +0200
+++ new/libXext-1.0.5/src/XSync.c 2008-12-03 20:02:05.000000000 +0100
@@ -1,4 +1,3 @@
-/* $Xorg: XSync.c,v 1.5 2001/02/09 02:03:49 xorgcvs Exp $ */
/*
Copyright 1991, 1993, 1998 The Open Group
@@ -287,11 +286,10 @@
int replylen;
int i;
- list = (XSyncSystemCounter *)Xmalloc(
- rep.nCounters * sizeof(XSyncSystemCounter));
+ list = Xmalloc(rep.nCounters * sizeof(XSyncSystemCounter));
replylen = rep.length << 2;
- pWireSysCounter = (xSyncSystemCounter *) Xmalloc ((unsigned) replylen + 1);
- /* +1 to leave room for last null-terminator */
+ pWireSysCounter = Xmalloc ((unsigned) replylen + sizeof(XSyncCounter));
+ /* +1 to leave room for last counter read-ahead */
if ((!list) || (!pWireSysCounter))
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Mar 2 01:17:06 CET 2009.
--------
--- xorg-x11-libX11/xorg-x11-libX11.changes 2009-02-24 14:14:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-libX11/xorg-x11-libX11.changes 2009-03-01 20:42:55.041163707 +0100
@@ -1,0 +2,9 @@
+Sun Mar 1 20:40:21 CET 2009 - sndirsch(a)suse.de
+
+- libX11 1.2
+- obsoletes bug356556-bad_array_index.diff,
+ p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2, p_xlc-locale.diff,
+ p_xlib-threadsafe.diff, xkb-rangefix.diff
+- adjusted p_sr_CS-compose.diff, p_xauth.diff, scim_swallow1.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
bug356556-bad_array_index.diff
libX11-1.1.5.tar.bz2
p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2
p_xlc-locale.diff
p_xlib-threadsafe.diff
xkb-rangefix.diff
New:
----
libX11-1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libX11.spec ++++++
--- /var/tmp/diff_new_pack.W14181/_old 2009-03-02 01:16:49.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new 2009-03-02 01:16:49.000000000 +0100
@@ -20,7 +20,7 @@
Name: xorg-x11-libX11
%define xcb 1
-%define dirsuffix 1.1.5
+%define dirsuffix 1.2
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.4
-Release: 6
+Release: 7
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -40,9 +40,6 @@
Source2: xorg-x11-libX11.csh
%endif
Patch: bug153744.diff
-Patch1: p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2
-Patch2: p_xlc-locale.diff
-Patch3: p_xlib-threadsafe.diff
Patch4: p_new-locales.diff
Patch5: p_xauth.diff
Patch6: p_sr_CS-compose.diff
@@ -51,9 +48,7 @@
Patch9: p_xlib_skip_ext_env.diff
Patch10: bug-239698_libx11.diff
Patch13: bug-221326-xim-sync.patch
-Patch14: bug356556-bad_array_index.diff
Patch15: en-locales.diff
-Patch16: xkb-rangefix.diff
Patch17: Xcms.diff
Patch18: compose-zh_CN.UTF-8.diff
Patch19: scim_swallow1.diff
@@ -125,9 +120,6 @@
test -f nls/ja.U90/XLC_LOCALE.pre && exit 1
test -f nls/ja.S90/XLC_LOCALE.pre && exit 1
%patch
-%patch1
-%patch2
-%patch3
%patch4
%patch5
%patch6
@@ -136,9 +128,7 @@
%patch9
%patch10 -p1
%patch13 -p1
-%patch14 -p0
%patch15 -p0
-%patch16 -p0
%patch17 -p0
%patch18 -p0
%patch19 -p1
@@ -214,6 +204,12 @@
%{_mandir}/man3/*
%changelog
+* Sun Mar 01 2009 sndirsch(a)suse.de
+- libX11 1.2
+- obsoletes bug356556-bad_array_index.diff,
+ p_XFree86-4.2.0-i18n-xlib-20020322.diff.bz2, p_xlc-locale.diff,
+ p_xlib-threadsafe.diff, xkb-rangefix.diff
+- adjusted p_sr_CS-compose.diff, p_xauth.diff, scim_swallow1.diff
* Tue Feb 24 2009 sndirsch(a)suse.de
- scim_swallow1.diff/scim_swallow2.diff:
* fix for bnc #434865
++++++ libX11-1.1.5.tar.bz2 -> libX11-1.2.tar.bz2 ++++++
++++ 42302 lines of diff (skipped)
++++++ p_sr_CS-compose.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old 2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new 2009-03-02 01:16:54.000000000 +0100
@@ -1,9 +1,9 @@
--- nls/en_US.UTF-8/Compose.pre.orig 2006-11-03 01:32:26.000000000 +0100
+++ nls/en_US.UTF-8/Compose.pre 2006-12-03 16:56:28.000000000 +0100
-@@ -6176,3 +6176,129 @@
- ##<Multi_key> <U1D1B9> <U1D165> <U1D16F> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
- <Multi_key> <U1D1BC> <U1D16F> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
- ##<Multi_key> <U1D1BA> <U1D165> <U1D16F> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+@@ -6693,3 +6693,129 @@
+ <dead_ogonek> <dead_macron> <o> : "ǭ" U01ED # LATIN SMALL LETTER O WITH OGONEK AND MACRON
+ <dead_tilde> <dead_macron> <O> : "Ȭ" U022C # LATIN CAPITAL LETTER O WITH TILDE AND MACRON
+ <dead_tilde> <dead_macron> <o> : "ȭ" U022D # LATIN SMALL LETTER O WITH TILDE AND MACRON
+# Serbian accented Cyrillic
+# а А - U+0430, U+0410 Cyrillic_a, Cyrillic_A
+# е Е - U+0435, U+0415 Cyrillic_e, Cyrillic_E
++++++ p_xauth.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old 2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new 2009-03-02 01:16:54.000000000 +0100
@@ -7,8 +7,8 @@
- if (phostname) Xfree (phostname);
if (pdpynum) Xfree (pdpynum);
if (pscrnum) Xfree (pscrnum);
- #ifdef TCPCONN
- if (tcphostname) Xfree (tcphostname);
+ #if defined(LOCALCONN) || defined(UNIXCONN) || defined(TCPCONN)
+ if (original_hostname) Xfree (original_hostname);
#endif
-
GetAuthorization(trans_conn, family, (char *) saddr, saddrlen, idisplay,
++++++ scim_swallow1.diff ++++++
--- /var/tmp/diff_new_pack.W14181/_old 2009-03-02 01:16:54.000000000 +0100
+++ /var/tmp/diff_new_pack.W14181/_new 2009-03-02 01:16:54.000000000 +0100
@@ -1,7 +1,6 @@
-diff -u -r libX11-1.1.4/modules/im/ximcp/imDefIc.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c
---- libX11-1.1.4/modules/im/ximcp/imDefIc.c 2008-10-30 16:48:31.000000000 +0100
-+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefIc.c 2008-10-30 16:41:13.000000000 +0100
-@@ -974,8 +974,6 @@
+--- a/modules/im/ximcp/imDefIc.c.orig 2009-03-01 20:20:31.000000000 +0100
++++ a/modules/im/ximcp/imDefIc.c 2009-03-01 20:22:09.000000000 +0100
+@@ -974,8 +974,6 @@ _XimProtoSetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
@@ -10,19 +9,18 @@
_XimRegisterFilter(ic);
return;
}
-@@ -1023,8 +1021,6 @@
+@@ -1023,8 +1021,6 @@ _XimProtoUnsetFocus(
(void)_XimWrite(im, len, (XPointer)buf);
_XimFlush(im);
- UNMARK_FOCUSED(ic);
--
+-
_XimUnregisterFilter(ic);
return;
}
-diff -u -r libX11-1.1.4/modules/im/ximcp/imDefLkup.c libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c
---- libX11-1.1.4/modules/im/ximcp/imDefLkup.c 2008-10-30 16:48:31.000000000 +0100
-+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imDefLkup.c 2008-10-30 16:46:18.000000000 +0100
-@@ -216,13 +216,8 @@
+--- a/modules/im/ximcp/imDefLkup.c.orig 2009-03-01 20:20:31.000000000 +0100
++++ a/modules/im/ximcp/imDefLkup.c 2009-03-01 20:24:45.000000000 +0100
+@@ -216,13 +216,8 @@ _XimRespSyncReply(
Xic ic,
BITMASK16 mode)
{
@@ -30,15 +28,15 @@
- if (IS_FOCUSED(ic))
- MARK_NEED_SYNC_REPLY(ic);
- else
-- _XimProcSyncReply(ic->core.im, ic);
+- _XimProcSyncReply((Xim)ic->core.im, ic);
- }
--
+-
+ if (mode & XimSYNCHRONUS) /* SYNC Request */
+ MARK_NEED_SYNC_REPLY(ic->core.im);
return True;
}
-@@ -359,7 +354,7 @@
+@@ -359,7 +354,7 @@ _XimProcEvent(
ev->xany.serial |= serial << 16;
ev->xany.send_event = False;
ev->xany.display = d;
@@ -47,7 +45,7 @@
return;
}
-@@ -712,7 +707,7 @@
+@@ -712,7 +707,7 @@ _XimCommitRecv(
if (ic->private.proto.registed_filter_event
& (KEYPRESS_MASK | KEYRELEASE_MASK))
@@ -56,7 +54,6 @@
ev.type = KeyPress;
ev.send_event = False;
-diff -u -r libX11-1.1.4/modules/im/ximcp/imExten.c libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c
--- libX11-1.1.4/modules/im/ximcp/imExten.c 2008-03-06 21:45:06.000000000 +0100
+++ libX11-1.1.4.xim-fix/modules/im/ximcp/imExten.c 2008-10-30 16:41:19.000000000 +0100
@@ -162,7 +162,7 @@
@@ -68,7 +65,6 @@
return True;
}
-diff -u -r libX11-1.1.4/src/xlibi18n/XimintP.h libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h
--- libX11-1.1.4/src/xlibi18n/XimintP.h 2008-03-06 21:45:06.000000000 +0100
+++ libX11-1.1.4.xim-fix/src/xlibi18n/XimintP.h 2008-10-30 16:41:19.000000000 +0100
@@ -144,6 +144,8 @@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-libxcb for openSUSE:Factory
checked in at Mon Mar 2 01:16:42 CET 2009.
--------
--- xorg-x11-libxcb/xorg-x11-libxcb.changes 2008-09-11 14:22:37.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libxcb/xorg-x11-libxcb.changes 2009-03-01 19:15:58.960703063 +0100
@@ -1,0 +2,6 @@
+Sun Mar 1 19:07:51 CET 2009 - sndirsch(a)suse.de
+
+- libxcb 1.2
+- obsoletes always-sloppy.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
always-sloppy.diff
libxcb-1.1.tar.bz2
New:
----
libxcb-1.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libxcb.spec ++++++
--- /var/tmp/diff_new_pack.M13337/_old 2009-03-02 01:16:31.000000000 +0100
+++ /var/tmp/diff_new_pack.M13337/_new 2009-03-02 01:16:31.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xorg-x11-libxcb (Version 7.4)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,18 +19,17 @@
Name: xorg-x11-libxcb
-%define dirsuffix 1.1
-BuildRequires: libxslt pkgconfig xorg-x11-libXau-devel xorg-x11-proto-devel
+%define dirsuffix 1.2
+BuildRequires: libxslt pkgconfig python-base python-xml xorg-x11-libXau-devel xorg-x11-proto-devel
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 1
+Release: 4
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
Summary: X.Org xcb library
Source: libxcb-%{dirsuffix}.tar.bz2
Patch1: bug-262309_xcb-xauthlocalhostname.diff
-Patch2: always-sloppy.diff
%description
This package contains the X.Org xcb library.
@@ -65,7 +64,6 @@
%prep
%setup -n libxcb-%{dirsuffix}
%patch1 -p1
-%patch2
%build
./configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
@@ -98,6 +96,9 @@
/usr/%{_lib}/pkgconfig/*.pc
%changelog
+* Sun Mar 01 2009 sndirsch(a)suse.de
+- libxcb 1.2
+- obsoletes always-sloppy.diff
* Thu Sep 11 2008 sndirsch(a)suse.de
- bumped release number to 7.4
* Mon Jul 21 2008 sndirsch(a)suse.de
++++++ libxcb-1.1.tar.bz2 -> libxcb-1.2.tar.bz2 ++++++
++++ 131270 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 xorg-x11-proto-devel for openSUSE:Factory
checked in at Mon Mar 2 01:16:24 CET 2009.
--------
--- xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-02-26 05:39:53.000000000 +0100
+++ /mounts/work_src_done/STABLE/xorg-x11-proto-devel/xorg-x11-proto-devel.changes 2009-03-01 20:51:21.151720177 +0100
@@ -1,0 +2,10 @@
+Sun Mar 1 20:51:13 CET 2009 - sndirsch(a)suse.de
+
+- xextproto 7.0.5
+
+-------------------------------------------------------------------
+Sun Mar 1 18:50:36 CET 2009 - sndirsch(a)suse.de
+
+- xcb-proto 1.4
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xcb-proto-1.1.tar.bz2
xextproto-7.0.3.tar.bz2
New:
----
xcb-proto-1.4.tar.bz2
xextproto-7.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-proto-devel.spec ++++++
--- /var/tmp/diff_new_pack.H12300/_old 2009-03-02 01:16:14.000000000 +0100
+++ /var/tmp/diff_new_pack.H12300/_new 2009-03-02 01:16:14.000000000 +0100
@@ -19,9 +19,10 @@
Name: xorg-x11-proto-devel
+BuildRequires: python-base
Url: http://xorg.freedesktop.org/
Version: 7.4
-Release: 5
+Release: 6
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/X11
@@ -48,7 +49,7 @@
Source19: videoproto-X11R7.0-2.2.2.tar.bz2
Source20: windowswmproto-X11R7.0-1.0.3.tar.bz2
Source21: xcmiscproto-X11R7.0-1.1.2.tar.bz2
-Source22: xextproto-7.0.3.tar.bz2
+Source22: xextproto-7.0.5.tar.bz2
Source23: xf86bigfontproto-X11R7.0-1.1.2.tar.bz2
Source24: xf86dgaproto-2.0.3.tar.bz2
Source25: xf86driproto-2.0.4.tar.bz2
@@ -59,7 +60,7 @@
Source30: xproto-7.0.14.tar.bz2
Source31: xproxymanagementprotocol-X11R7.0-1.0.2.tar.bz2
Source32: evieext-X11R7.0-1.0.2.tar.bz2
-Source33: xcb-proto-1.1.tar.bz2
+Source33: xcb-proto-1.4.tar.bz2
Source34: libpthread-stubs-0.1.tar.bz2
Source35: vncproto-20070501.tar.bz2
Source36: xcliplistproto-20070501.tar.bz2
@@ -136,10 +137,15 @@
/usr/include/X11/extensions/*.h
/usr/include/X11/fonts/*.h
/usr/%{_lib}/pkgconfig/*.pc
+/usr/%{_lib}/python2.6/site-packages/xcbgen/
/usr/share/aclocal/*.m4
/usr/share/xcb/
%changelog
+* Sun Mar 01 2009 sndirsch(a)suse.de
+- xextproto 7.0.5
+* Sun Mar 01 2009 sndirsch(a)suse.de
+- xcb-proto 1.4
* Thu Feb 26 2009 sndirsch(a)suse.de
- back to xextproto 7.0.3
* Thu Feb 26 2009 sndirsch(a)suse.de
++++++ xcb-proto-1.1.tar.bz2 -> xcb-proto-1.4.tar.bz2 ++++++
++++ 7429 lines of diff (skipped)
++++++ xextproto-7.0.3.tar.bz2 -> xextproto-7.0.5.tar.bz2 ++++++
++++ 5235 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/xextproto-7.0.3/autogen.sh new/xextproto-7.0.5/autogen.sh
--- old/xextproto-7.0.3/autogen.sh 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
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/xextproto-7.0.3/ChangeLog new/xextproto-7.0.5/ChangeLog
--- old/xextproto-7.0.3/ChangeLog 2008-05-29 02:50:03.000000000 +0200
+++ new/xextproto-7.0.5/ChangeLog 2009-01-29 19:22:01.000000000 +0100
@@ -1,3 +1,47 @@
+commit 8b5b82ec72dd6952d0664655715a0a47951454f4
+Author: Paulo Cesar Pereira de Andrade <pcpa(a)mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit fa652c6013a5d3ae8106814d97245fdbac3557ac
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Tue Dec 23 16:16:46 2008 +0100
+
+ Add geproto.txt to EXTRA_DIST
+
+commit bd7f3e16b5a5520f0abb8c481f23a19219d26c7f
+Author: Julien Cristau <jcristau(a)debian.org>
+Date: Tue Dec 23 15:45:13 2008 +0100
+
+ COPYING: add Peter Hutterer's license and copyright notice
+
+ Taken from Xge.h
+
+commit e1773d8ad7d36535f856dcb308be9a1b0601c1fc
+Author: Peter Hutterer <peter.hutterer(a)who-t.net>
+Date: Thu Dec 18 10:10:42 2008 +1000
+
+ Bump to 7.0.4
+
+commit e7f0c4261c59da82da1c151dd1bd0d143a32906a
+Author: Peter Hutterer <peter.hutterer(a)redhat.com>
+Date: Mon Dec 1 14:44:03 2008 +1000
+
+ Clean up XGE documentation.
+
+commit b0080664e432f8ee569ce099a536c0232dd64d3e
+Author: Peter Hutterer <peter.hutterer(a)redhat.com>
+Date: Mon Dec 1 15:41:16 2008 +1000
+
+ geproto: remote trailing whitespaces.
+
+commit f7e5f23e37e62cc0a981d9b002b69d90b8a7daa9
+Author: Peter Hutterer <peter.hutterer(a)redhat.com>
+Date: Fri Sep 26 14:54:19 2008 +0930
+
+ Xge.h: include Xmd.h for CARD8
+
commit db08133016b421ef12c65db9c4a2819078f01b06
Author: Peter Hutterer <peter(a)cs.unisa.edu.au>
Date: Wed May 28 17:18:14 2008 +0930
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/xextproto-7.0.3/configure.ac new/xextproto-7.0.5/configure.ac
--- old/xextproto-7.0.3/configure.ac 2008-05-29 02:33:00.000000000 +0200
+++ new/xextproto-7.0.5/configure.ac 2009-01-29 19:18:50.000000000 +0100
@@ -1,8 +1,12 @@
AC_PREREQ([2.57])
-AC_INIT([XExtProto], [7.0.3], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
+AC_INIT([XExtProto], [7.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
xextproto.pc])
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/xextproto-7.0.3/COPYING new/xextproto-7.0.5/COPYING
--- old/xextproto-7.0.3/COPYING 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/COPYING 2009-01-27 22:25:54.000000000 +0100
@@ -177,3 +177,25 @@
This software is not subject to any license of the American
Telephone and Telegraph Company or of the Regents of the
University of California.
+
+
+Copyright © 2007-2008 Peter Hutterer
+
+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.
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/xextproto-7.0.3/geproto.h new/xextproto-7.0.5/geproto.h
--- old/xextproto-7.0.3/geproto.h 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/geproto.h 2009-01-27 22:25:54.000000000 +0100
@@ -42,7 +42,7 @@
/*********************************************************
*
- * XGE protocol requests/replies
+ * XGE protocol requests/replies
*
*/
@@ -56,9 +56,9 @@
/* QueryVersion */
typedef struct {
- CARD8 reqType; /* input extension major code */
- CARD8 ReqType; /* always X_GEQueryVersion */
- CARD16 length B16;
+ CARD8 reqType; /* input extension major code */
+ CARD8 ReqType; /* always X_GEQueryVersion */
+ CARD16 length B16;
CARD16 majorVersion B16;
CARD16 minorVersion B16;
} xGEQueryVersionReq;
@@ -66,17 +66,17 @@
#define sz_xGEQueryVersionReq 8
typedef struct {
- CARD8 repType; /* X_Reply */
- CARD8 RepType; /* always X_GEQueryVersion */
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD16 majorVersion B16;
- CARD16 minorVersion B16;
- CARD32 pad00 B32;
- CARD32 pad01 B32;
- CARD32 pad02 B32;
- CARD32 pad03 B32;
- CARD32 pad04 B32;
+ CARD8 repType; /* X_Reply */
+ CARD8 RepType; /* always X_GEQueryVersion */
+ CARD16 sequenceNumber B16;
+ CARD32 length B32;
+ CARD16 majorVersion B16;
+ CARD16 minorVersion B16;
+ CARD32 pad00 B32;
+ CARD32 pad01 B32;
+ CARD32 pad02 B32;
+ CARD32 pad03 B32;
+ CARD32 pad04 B32;
} xGEQueryVersionReply;
#define sz_xGEQueryVersionReply 32
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/xextproto-7.0.3/geproto.txt new/xextproto-7.0.5/geproto.txt
--- old/xextproto-7.0.3/geproto.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/xextproto-7.0.5/geproto.txt 2009-01-27 22:25:54.000000000 +0100
@@ -0,0 +1,83 @@
+ X Generic Event Extension
+ Peter Hutterer
+ peter.hutterer(a)who-t.net
+
+
+1. Introduction
+2. Extension Initialization
+3. Extension Events
+4. Notes
+
+_____________________________________________________________________________
+1. Introduction
+
+X was designed to provide 64 event opcodes for all extensions. These events
+are limited to 32 bytes.
+
+The Generic Event Extension provides a template event for extensions to re-use
+a single event opcode. GE only provide headers and the most basic
+functionality, leaving the extensions to interpret the events in their
+specific context.
+
+GenericEvents may be longer than 32 bytes. If so, the number of 4 byte units
+following the initial 32 bytes must be specified in the length field of the
+event.
+_____________________________________________________________________________
+2. Extension Initialization
+
+The name of this extension is "Generic Event Extension"
+
+┌───
+ GEQueryVersion
+ client-major-version: CARD16
+ client-minor-version: CARD16
+ ▶
+ major-version: CARD16
+ minor-version: CARD16
+└───
+
+ The client sends the highest supported version to the server
+ and the server sends the highest version it supports, but no
+ higher than the requested version. Major versions changes can
+ introduce incompatibilities in existing functionality, minor
+ version changes introduce only backward compatible changes.
+ It is the clients responsibility to ensure that the server
+ supports a version which is compatible with its expectations.
+
+
+ As of version 1.0, no other requests are provided by this extension.
+_____________________________________________________________________________
+3. Extension Events
+
+GE defines a single event, to be used by all extensions. The event's structure
+is similar to a reply.
+
+┌───
+ GenericEvent
+ type: BYTE; always GenericEvent
+ extension: CARD8; extension offset
+ sequenceNumber: CARD16 low 16 bits of request seq. number
+ length: CARD32 length
+ evtype: CARD16 event type
+└───
+
+ The field 'extension' is to be set to the major opcode of the
+ extension. The 'evtype' field is the actual opcode of the event.
+ The length field specifies the number of 4-byte blocks after the
+ initial 32 bytes. If length is 0, the event is 32 bytes long.
+_____________________________________________________________________________
+4. Notes
+
+Although the wire event is of arbitrary length, the actual size of an XEvent
+is restricted to sizeof(XEvent) [96 bytes, see Xlib.h]. If an extension
+converts a wire event to an XEvent > 96 bytes, it will overwrite the space
+allocated for the event. See struct _XSQEvent in Xlibint.h for details.
+
+Extensions need to malloc additional data and fill the XEvent structure with
+pointers to the malloc'd data. The client then needs to free the data, only
+the XEvent structure will be released by Xlib.
+
+The server must not send GenericEvents longer than 32 bytes until it has
+verified that the client is able to interpret these events. If a long event is
+sent to a client unable to process GenericEvents, future interpretation of
+replies and events by this client will fail.
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/xextproto-7.0.3/Makefile.am new/xextproto-7.0.5/Makefile.am
--- old/xextproto-7.0.3/Makefile.am 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/Makefile.am 2009-01-27 22:48:31.000000000 +0100
@@ -42,7 +42,7 @@
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xextproto.pc
-EXTRA_DIST = autogen.sh xextproto.pc.in
+EXTRA_DIST = xextproto.pc.in geproto.txt
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
@@ -50,6 +50,6 @@
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
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/xextproto-7.0.3/missing new/xextproto-7.0.5/missing
--- old/xextproto-7.0.3/missing 2008-05-22 02:05:44.000000000 +0200
+++ new/xextproto-7.0.5/missing 2009-01-27 22:53:38.000000000 +0100
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2003-09-02.23
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996.
@@ -19,8 +19,8 @@
# 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., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -60,11 +62,6 @@
msg="probably too old"
fi
;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-h|--h|--he|--hel|--help)
echo "\
@@ -82,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -92,10 +90,12 @@
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
Send bug reports to <bug-automake(a)gnu.org>."
+ exit $?
;;
-v|--v|--ve|--ver|--vers|--versi|--versio|--version)
echo "missing $scriptversion (GNU Automake)"
+ exit $?
;;
-*)
@@ -104,12 +104,42 @@
exit 1
;;
- aclocal*)
+esac
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program).
+case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ tar)
+ if test -n "$run"; then
+ echo 1>&2 "ERROR: \`tar' requires --run"
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ exit 1
+ fi
+ ;;
+
+ *)
if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
# We have it, but it failed.
exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
fi
+ ;;
+esac
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $1 in
+ aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acinclude.m4' or \`${configure_ac}'. You might want
@@ -119,11 +149,6 @@
;;
autoconf)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -133,11 +158,6 @@
;;
autoheader)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -147,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -157,11 +177,6 @@
;;
automake*)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
@@ -173,11 +188,6 @@
;;
autom4te)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -185,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -207,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -237,39 +247,32 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
help2man)
- if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
- # We have it, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -279,11 +282,6 @@
;;
makeinfo)
- if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
- # We have makeinfo, but it failed.
- exit 1
- fi
-
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -291,20 +289,29 @@
call might also be the consequence of using a buggy \`make' (AIX,
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
- fi
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
touch $file
;;
tar)
shift
- if test -n "$run"; then
- echo 1>&2 "ERROR: \`tar' requires --run"
- exit 1
- fi
# We have already tried tar in the generic part.
# Look for gnutar/gtar before invocation to avoid ugly error
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
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/xextproto-7.0.3/Xext.h new/xextproto-7.0.5/Xext.h
--- old/xextproto-7.0.3/Xext.h 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/Xext.h 2009-01-29 19:20:24.000000000 +0100
@@ -32,16 +32,14 @@
_XFUNCPROTOBEGIN
-extern int (*XSetExtensionErrorHandler(
- int (*handler)(
- Display *,
- char *,
- char *
- )
-))(
- Display *,
- char *,
- char *
+typedef int (*XextErrorHandler) (
+ Display * /* dpy */,
+ _Xconst char* /* ext_name */,
+ _Xconst char* /* reason */
+);
+
+extern XextErrorHandler XSetExtensionErrorHandler(
+ XextErrorHandler /* handler */
);
extern int XMissingExtension(
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/xextproto-7.0.3/Xge.h new/xextproto-7.0.5/Xge.h
--- old/xextproto-7.0.3/Xge.h 2008-05-22 02:05:29.000000000 +0200
+++ new/xextproto-7.0.5/Xge.h 2009-01-27 22:25:54.000000000 +0100
@@ -30,6 +30,7 @@
#ifndef _XGE_H_
#define _XGE_H_
+#include <X11/Xmd.h>
#include <X11/Xlib.h>
#include <X11/Xfuncproto.h>
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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