Merge pull request #335 from mariux64/update-xorg-server-from-1.18.4-…

…to-1.19.3 Update X.Org Server from 1.18.4 to 1.19.3
mariux64 · Apr 5, 2017 · 500fa96 · 500fa96
2 parents 9d999e1 + f93cb96
commit 500fa96
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 96 deletions.
diff --git a/font-util-1.3.0-0.bee → font-util.be0 b/font-util-1.3.0-0.bee → font-util.be0
@@ -1,13 +1,15 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION font-util-1.3.1-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
 ###############################################################################
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/font/font-util-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/font/font-util-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/font/font-util-${PKGV
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {

diff --git a/libXfont-1.4.7-0.bee → libXfont2.be0 b/libXfont-1.4.7-0.bee → libXfont2.be0
@@ -1,13 +1,15 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libXfont2-2.0.1-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
 ###############################################################################
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/lib/libXfont2-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -22,8 +24,8 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVER
 # EXCLUDE+=()
 
 ###############################################################################
-## Uncomment the next statement, if the software may not be able to be build
-## outside the source directory and need to be build inside the source
+## Uncomment the next statement, if the software may not be able to be built
+## outside the source directory and needs to be built inside the source
 ## directory.
 
 # build_in_sourcedir
@@ -52,7 +54,9 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/lib/libXfont-${PKGVER
 #}
 
 mee_configure() {
-    bee_configure --disable-devel-docs
+    bee_configure \
+        --disable-devel-docs \
+        --disable-static
 }
 
 #mee_build() {
@@ -71,7 +75,7 @@ mee_configure() {
 ## The name of this bee-file should follow the following naming convention:
 ##     pkgname-pkgversion-pkgrevision.bee
 ##
-## You may remove all comments as long as SRCURL[0]="" is set.
+## You may remove all comments as long as SRCURL[0] is set.
 ##
 ## Everything in this file will be executed in a bash environment.
 ##

diff --git a/libevdev-1.5.2-0.bee → libevdev.be0 b/libevdev-1.5.2-0.bee → libevdev.be0
@@ -1,5 +1,7 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION libevdev-1.5.6-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 

diff --git a/scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh b/scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+bee update xproto
+bee update font-util
+bee remove bdftopcf-1.0.4-0.x86_64
+bee remove libXfont-1.4.7-0.x86_64
+bee install libXfont2
+bee update xorg-server
+bee update libevdev
+bee update xf86-input-evdev
diff --git a/xf86-input-evdev.be0 b/xf86-input-evdev.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xf86-input-evdev-2.10.3-0
+# BEE_VERSION xf86-input-evdev-2.10.5-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -9,7 +9,7 @@
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://ftp.x.org/pub/individual/driver/xf86-input-evdev-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/driver/xf86-input-evdev-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.

diff --git a/xorg-server.be0 b/xorg-server.be0
@@ -1,6 +1,6 @@
 #!/usr/bin/env beesh
 
-# BEE_VERSION xorg-server-1.18.4-0
+# BEE_VERSION xorg-server-1.19.3-0
 
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
@@ -17,7 +17,7 @@ SRCURL[0]="https://ftp.x.org/pub/individual/xserver/xorg-server-${PKGVERSION}.ta
 
 # PATCHURL[0]="/src/mariux/download/xorg-xinerama.patch"
 
-PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.18.4-add_prime_support-1.patch)
+PATCHURL+=(http://www.linuxfromscratch.org/patches/blfs/svn/xorg-server-1.19.3-add_prime_support-1.patch)
 
 ###############################################################################
 ## Add filename patterns to the EXCLUDE array of files that should not

diff --git a/xproto-7.0.28-0.bee b/xproto-7.0.28-0.bee
diff --git a/bdftopcf-1.0.4-0.bee → xproto.be0 b/bdftopcf-1.0.4-0.bee → xproto.be0
@@ -1,13 +1,15 @@
 #!/usr/bin/env beesh
 
+# BEE_VERSION xproto-7.0.31-0
+
 ## this file was created by bee init and should be executed to build a
 ## bee-package. (Additional hints are located at the end of this file.)
 
 ###############################################################################
 ## The source URL(s) define the location of the sources that will be
 ## downloaded. Version variables may be used to simplify reuse of this bee-file.
 
-SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/bdftopcf-${PKGVERSION}.tar.bz2"
+SRCURL[0]="https://www.x.org/releases/individual/proto/xproto-${PKGVERSION}.tar.bz2"
 
 ###############################################################################
 ## Add URLs/pathes to patch files to the PATCHURL array.
@@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/bdftopcf-${PKGVER
 #}
 
 #mee_configure() {
-#    bee_configure 
+#    bee_configure
 #}
 
 #mee_build() {