Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=dex77testing2.git;a=commitdiff;h=4bba9915695f65a3f9213f84e1b64d3c8e03c778
commit 4bba9915695f65a3f9213f84e1b64d3c8e03c778 Author: DeX77 <[email protected]> Date: Fri Jul 18 14:21:21 2014 +0200 xorg-server-minimal-1.15.2-1-x86_64 * version bump diff --git a/source/x11-extra/xorg-server-minimal/FrugalBuild b/source/x11-extra/xorg-server-minimal/FrugalBuild index c19ecd1..603df23 100644 --- a/source/x11-extra/xorg-server-minimal/FrugalBuild +++ b/source/x11-extra/xorg-server-minimal/FrugalBuild @@ -3,7 +3,7 @@ pkgname=xorg-server-minimal _F_xorg_name=xorg-server -pkgver=1.11.2 +pkgver=1.15.2 pkgrel=1 pkgdesc="X.Org X Server for Fwife Install CD" groups=('x11-extra') @@ -11,7 +11,7 @@ archs=('i686' 'x86_64' ) depends=('libxfont>=1.4.0' 'libx11>=1.3' 'xtrans>=1.2.3' 'libxau>=1.0.4' 'libsm' \ 'libxkbfile>=1.0.5' 'libxdmcp>=1.0.2-2' 'libxrender>=0.9.4-3' 'libxext' \ 'freetype2' 'xkeyboard-config>=1.7' 'pixman>=0.18.2' 'libpciaccess>=0.10.8' \ - 'libgl') + 'libgl' 'xineramaproto') makedepends=('randrproto>=1.3.0' 'renderproto>=0.9.3' 'fixesproto' 'damageproto>=1.1.0' 'xproto>=7.0.15' \ 'xf86dgaproto' 'compositeproto>=0.4' 'resourceproto' 'videoproto>=2.2.2' 'scrnsaverproto' 'evieext' \ 'fontsproto' 'kbproto' 'inputproto>=1.5' 'bigreqsproto' 'xcmiscproto' 'xextproto>=7.0.99.3' \ @@ -22,12 +22,10 @@ up2date="lynx -dump $_F_xorg_url | grep -v '90[123456]' | Flasttar" F_cd_path=$_F_xorg_name-$pkgver options=("nodocs") source=($source hack-since-suffix-support-is-half-br0ken.patch \ - 10-evdev.conf \ - xorg-server-1.9-nouveau-default.patch) -sha1sums=('b4de5c599c90bd08d3122866ba68152cd59a880e' \ - '346319ba09ad3fa4844f938ca70d7ed12af96108' \ - '7a7802630be5a1477e247a1ce2e29f167c77bbfa' \ - 'bda6f333b53fcc2e1d823364a1e12e2061a66700') + 10-evdev.conf ) +sha1sums=('72faa9e80e356b2085bd74a96b0df9dc627428ab' \ + 'c02d5efd285a94624a89cabfcaeed5ec6c19e79c' \ + '7a7802630be5a1477e247a1ce2e29f167c77bbfa') Fconfopts+=" --enable-install-setuid \ --disable-kdrive --disable-xvfb\ --disable-glx --disable-xvmc \ diff --git a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch index 82d9329..ae87061 100644 --- a/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch +++ b/source/x11-extra/xorg-server-minimal/hack-since-suffix-support-is-half-br0ken.patch @@ -1,12 +1,11 @@ -diff -Naur xorg-server-1.11.2/hw/xfree86/Makefile.am xorg-server-1.11.2/hw/xfree86/Makefile.am ---- xorg-server-1.11.2/hw/xfree86/Makefile.am 2011-07-15 15:26:37.000000000 +0200 -+++ xorg-server-1.11.2/hw/xfree86/Makefile.am 2011-12-14 22:33:50.103324912 +0100 -@@ -89,10 +89,10 @@ - +--- xorg-server-1.15.2/hw/xfree86/Makefile.am 2014-06-26 08:02:12.000000000 +0200 ++++ xorg-server-1.15.2.new/hw/xfree86/Makefile.am 2014-07-18 14:19:09.000000000 +0200 +@@ -88,10 +88,10 @@ + endif - install-exec-local: install-binPROGRAMS -- (cd $(DESTDIR)$(bindir) && rm -f X && ln -s Xorg X) -+ (cd $(DESTDIR)$(bindir) && rm -f X && ln -s Xorg-fwife X-fwife) + install-exec-hook: +- (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X) ++ (cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg-fwife$(EXEEXT) X-fwife) if INSTALL_SETUID - chown root $(DESTDIR)$(bindir)/Xorg - chmod u+s $(DESTDIR)$(bindir)/Xorg @@ -14,13 +13,13 @@ diff -Naur xorg-server-1.11.2/hw/xfree86/Makefile.am xorg-server-1.11.2/hw/xfree + chmod u+s $(DESTDIR)$(bindir)/Xorg-fwife endif - # Use variables from XORG_MANPAGE_SECTIONS and X Server configuration -@@ -105,7 +105,7 @@ + uninstall-local: +@@ -112,7 +112,7 @@ $(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $(srcdir)/xorgconf.cpp > $@ relink: -- $(AM_V_at)rm -f Xorg && $(MAKE) Xorg -+ $(AM_V_at)rm -f Xorg-fwife && $(MAKE) Xorg +- $(AM_V_at)rm -f Xorg$(EXEEXT) && $(MAKE) Xorg$(EXEEXT) ++ $(AM_V_at)rm -f Xorg$(EXEEXT) && $(MAKE) Xorg-fwife$(EXEEXT) CLEANFILES = sdksyms.c sdksyms.dep EXTRA_DIST += sdksyms.sh _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
