Skip to content
Jump to bottom

Update X.Org Server from 1.18.4 to 1.19.3 #335

Merged
merged 21 commits into from
Apr 5, 2017
Merged

Update X.Org Server from 1.18.4 to 1.19.3 #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
367b49f
xproto: Strip trailing spaces
pmenzel Mar 30, 2017
b89f479
xproto: Use new, secure source URL
pmenzel Mar 30, 2017
05f2126
xproto: Update version from 7.0.28 to 7.0.31
pmenzel Mar 30, 2017
0c77310
libXfont2: Add version 2.0.1
pmenzel Mar 30, 2017
64a9761
Remove legacy X fonts
pmenzel Mar 30, 2017
95adc1f
X: Remove unneeded legacy fonts
pmenzel Mar 30, 2017
e04e58f
font-util: Convert to versionless bee file
pmenzel Mar 30, 2017
f33f7ab
font-util: Strip trailing space
pmenzel Mar 30, 2017
9b012f2
font-util: Use new, secure source URL
pmenzel Mar 30, 2017
9bf3121
bdftopcf: Remove unneeded version
pmenzel Mar 30, 2017
31f8c6d
font-util: Update version from 1.3.0 to 1.3.1
pmenzel Mar 30, 2017
27cf70b
xorg-server: Update version from 1.18.4 to 1.19.3
pmenzel Mar 30, 2017
41cd690
Remove libXfont 1.4.7
pmenzel Apr 3, 2017
d29723e
xf86-input-evdev: Securely download source archive
pmenzel Mar 30, 2017
fd15ca6
libevdev: Convert to versionless bee file
pmenzel Mar 30, 2017
37ae8e8
libevdev: Update version from 1.5.2 to 1.5.6
pmenzel Mar 30, 2017
0fc11bf
xf86-input-evdev: Update version from 2.10.3 to 2.10.5
pmenzel Mar 30, 2017
1771502
scripts: Add commands for updating to X.Org 1.19.3
pmenzel Mar 30, 2017
d343037
Revert "X: Remove unneeded legacy fonts"
pmenzel Apr 4, 2017
ed13718
Revert "Remove legacy X fonts"
pmenzel Apr 4, 2017
f93cb96
scripts: Leave legacy X fonts installed
pmenzel Apr 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions font-util-1.3.0-0.bee → font-util.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/font/font-util-${PKGV
#}

#mee_configure() {
# bee_configure
# bee_configure
#}

#mee_build() {
Expand Down
14 changes: 9 additions & 5 deletions libXfont-1.4.7-0.bee → libXfont2.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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() {
Expand All @@ -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.
##
Expand Down
2 changes: 2 additions & 0 deletions libevdev-1.5.2-0.bee → libevdev.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.)

Expand Down
10 changes: 10 additions & 0 deletions scripts/update-xorg-server-from-1.18.4-to-1.19.3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Copy link
Collaborator

@donald donald Apr 3, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For testing, the obsoleted font-packages should be remove as well:

bee remove font-adobe-100dpi-1.0.3-0.x86_64
bee remove font-adobe-75dpi-1.0.3-0.x86_64
bee remove font-adobe-utopia-100dpi-1.0.4-0.x86_64
bee remove font-adobe-utopia-75dpi-1.0.4-0.x86_64
bee remove font-arabic-misc-1.0.3-0.x86_64
bee remove font-bh-100dpi-1.0.3-0.x86_64
bee remove font-bh-75dpi-1.0.3-0.x86_64
bee remove font-bh-lucidatypewriter-100dpi-1.0.3-0.x86_64
bee remove font-bh-lucidatypewriter-75dpi-1.0.3-0.x86_64
bee remove font-bitstream-100dpi-1.0.3-0.x86_64
bee remove font-bitstream-75dpi-1.0.3-0.x86_64
bee remove font-bitstream-type1-1.0.3-0.x86_64
bee remove font-cronyx-cyrillic-1.0.3-0.x86_64
bee remove font-cursor-misc-1.0.3-0.x86_64
bee remove font-daewoo-misc-1.0.3-0.x86_64
bee remove font-dec-misc-1.0.3-0.x86_64
bee remove font-isas-misc-1.0.3-0.x86_64
bee remove font-jis-misc-1.0.3-0.x86_64
bee remove font-micro-misc-1.0.3-0.x86_64
bee remove font-misc-cyrillic-1.0.3-0.x86_64
bee remove font-misc-meltho-1.0.3-0.x86_64
bee remove font-misc-misc-1.1.2-0.x86_64
bee remove font-mutt-misc-1.0.3-0.x86_64
bee remove font-schumacher-misc-1.1.2-0.x86_64
bee remove font-screen-cyrillic-1.0.4-0.x86_64
bee remove font-sony-misc-1.0.3-0.x86_64
bee remove font-sun-misc-1.0.3-0.x86_64
bee remove font-symbola-9.00-0.x86_64
bee remove font-winitzki-cyrillic-1.0.3-0.x86_64

4 changes: 2 additions & 2 deletions xf86-input-evdev.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.)
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions xorg-server.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.)
Expand All @@ -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
Expand Down
83 changes: 0 additions & 83 deletions xproto-7.0.28-0.bee
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions bdftopcf-1.0.4-0.bee → xproto.be0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -52,7 +54,7 @@ SRCURL[0]="http://xorg.freedesktop.org/releases/individual/app/bdftopcf-${PKGVER
#}

#mee_configure() {
# bee_configure
# bee_configure
#}

#mee_build() {
Expand Down