summaryrefslogtreecommitdiffstats
path: root/xorg-util
diff options
context:
space:
mode:
authorEric Sandall2009-10-27 14:13:09 -0700
committerEric Sandall2009-10-27 16:47:04 -0700
commitd34ffe85bd6dc2e805da2cefb362dc685a8eb708 (patch)
treea82567e21498c1d59842cf45fd49d6f5ccc0f584 /xorg-util
parentc43fe47922fc66619b7382a01bb610768400cd76 (diff)
xorg-cf-files: Updated to 1.0.3
SOURCE matches upstream posted MD5 Removed PATCHLEVEL 05_xaw_without_xp.diff synched against 1.0.3 and applies with -p1 (cherry picked from commit 7709dbc71a8747de0c0fc74856b3730d636de825)
Diffstat (limited to 'xorg-util')
-rw-r--r--xorg-util/xorg-cf-files/05_xaw_without_xp.diff15
-rwxr-xr-xxorg-util/xorg-cf-files/DETAILS6
-rw-r--r--xorg-util/xorg-cf-files/HISTORY7
-rwxr-xr-xxorg-util/xorg-cf-files/PRE_BUILD2
-rw-r--r--xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sigbin0 -> 287 bytes
5 files changed, 15 insertions, 15 deletions
diff --git a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
index d327c456e6..79fdb18a16 100644
--- a/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
+++ b/xorg-util/xorg-cf-files/05_xaw_without_xp.diff
@@ -1,14 +1,7 @@
----
- xorg-cf-files/FreeBSD.cf | 10 ++++++++++
- xorg-cf-files/gnu.cf | 10 ++++++++++
- xorg-cf-files/linux.cf | 10 ++++++++++
- 3 files changed, 30 insertions(+)
-
-Index: xutils-dev/xorg-cf-files/linux.cf
-===================================================================
---- xutils-dev.orig/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200
-+++ xutils-dev/xorg-cf-files/linux.cf 2008-06-01 18:36:51.000000000 +0200
-@@ -1153,6 +1153,16 @@
+diff -Naur xorg-cf-files-1.0.3.orig/linux.cf xorg-cf-files-1.0.3/linux.cf
+--- xorg-cf-files-1.0.3.orig/linux.cf 2009-10-27 14:13:33.480912412 -0700
++++ xorg-cf-files-1.0.3/linux.cf 2009-10-27 14:14:01.877916656 -0700
+@@ -1052,6 +1052,16 @@
#define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB)
#define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB)
diff --git a/xorg-util/xorg-cf-files/DETAILS b/xorg-util/xorg-cf-files/DETAILS
index e0357b3976..cc31d9c7b9 100755
--- a/xorg-util/xorg-cf-files/DETAILS
+++ b/xorg-util/xorg-cf-files/DETAILS
@@ -1,15 +1,15 @@
SPELL=xorg-cf-files
PKG=xorg-cf-files
- VERSION=1.0.2
+ VERSION=1.0.3
XORG_VER=X11R7.0
SOURCE=${PKG}-${VERSION}.tar.bz2
+ SOURCE_GPG="gurus.gpg:$SOURCE.sig:UPSTREAM_HASH"
SOURCE_URL[0]=http://xorg.freedesktop.org/releases/individual/util/${SOURCE}
- SOURCE_HASH=sha512:ccee7f26febb51aacefa04508acf4706cacee675dc0652e40891ad00925b9600612342c8d51d99730c2afa97bfde9bebf1c33d360362805369f5c682ab56d7a8
+# SOURCE_HASH=sha512:ccee7f26febb51aacefa04508acf4706cacee675dc0652e40891ad00925b9600612342c8d51d99730c2afa97bfde9bebf1c33d360362805369f5c682ab56d7a8
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${PKG}-${VERSION}
WEB_SITE=http://xorg.freedesktop.org
ENTERED=20051125
LICENSE[0]=XCL
- PATCHLEVEL=1
SHORT="host.def files for X window"
cat << EOF
host.def files for X window.
diff --git a/xorg-util/xorg-cf-files/HISTORY b/xorg-util/xorg-cf-files/HISTORY
index 2f961bdde5..c6a5d7d550 100644
--- a/xorg-util/xorg-cf-files/HISTORY
+++ b/xorg-util/xorg-cf-files/HISTORY
@@ -1,3 +1,10 @@
+2009-10-27 Eric Sandall <sandalle@sourcemage.org>
+ * DETAILS: Updated to 1.0.3
+ SOURCE matches upstream posted MD5
+ Removed PATCHLEVEL
+ * 05_xaw_without_xp.diff: Synched against 1.0.3
+ * PRE_BUILD: 05_xaw_without_xp.diff now applies with -p1
+
2009-01-26 Andra┼ż "ruskie" Levstik <ruskie@mages.ath.cx>
* PRE_BUILD: patch added
* 05_xaw_without_xp.diff: debian patch to fix:
diff --git a/xorg-util/xorg-cf-files/PRE_BUILD b/xorg-util/xorg-cf-files/PRE_BUILD
index 2a50af8da8..40345a02ed 100755
--- a/xorg-util/xorg-cf-files/PRE_BUILD
+++ b/xorg-util/xorg-cf-files/PRE_BUILD
@@ -1,5 +1,5 @@
default_pre_build &&
cd $SOURCE_DIRECTORY &&
patch -Np0 < "$SCRIPT_DIRECTORY/lib64.patch" &&
-patch -p2 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
+patch -p1 < $SPELL_DIRECTORY/05_xaw_without_xp.diff &&
sedit "s:/X11R6::" $SOURCE_DIRECTORY/site.def
diff --git a/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig b/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig
new file mode 100644
index 0000000000..4f210225b4
--- /dev/null
+++ b/xorg-util/xorg-cf-files/xorg-cf-files-1.0.3.tar.bz2.sig
Binary files differ