Merge branch '3.5' into 3.6

This commit is contained in:
Juergen Daubert 2020-11-22 15:31:30 +00:00
commit 0ba1ef150d
3 changed files with 29 additions and 29 deletions

View File

@ -22,9 +22,9 @@ lrwxrwxrwx root/root usr/lib/libX11-xcb.so.1 -> libX11-xcb.so.1.0.0
-rwxr-xr-x root/root usr/lib/libX11-xcb.so.1.0.0
-rw-r--r-- root/root usr/lib/libX11.a
-rwxr-xr-x root/root usr/lib/libX11.la
lrwxrwxrwx root/root usr/lib/libX11.so -> libX11.so.6.3.0
lrwxrwxrwx root/root usr/lib/libX11.so.6 -> libX11.so.6.3.0
-rwxr-xr-x root/root usr/lib/libX11.so.6.3.0
lrwxrwxrwx root/root usr/lib/libX11.so -> libX11.so.6.4.0
lrwxrwxrwx root/root usr/lib/libX11.so.6 -> libX11.so.6.4.0
-rwxr-xr-x root/root usr/lib/libX11.so.6.4.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/x11-xcb.pc
-rw-r--r-- root/root usr/lib/pkgconfig/x11.pc
@ -34,13 +34,13 @@ drwxr-xr-x root/root usr/share/X11/
-rw-r--r-- root/root usr/share/X11/Xcms.txt
drwxr-xr-x root/root usr/share/X11/locale/
drwxr-xr-x root/root usr/share/X11/locale/C/
-rw-r--r-- root/root usr/share/X11/locale/C/Compose
-rw-r--r-- root/root usr/share/X11/locale/C/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/C/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/C/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/am_ET.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/am_ET.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/am_ET.UTF-8/XI18N_OBJS (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/am_ET.UTF-8/XLC_LOCALE
-rw-r--r-- root/root usr/share/X11/locale/am_ET.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/armscii-8/
-rw-r--r-- root/root usr/share/X11/locale/armscii-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/armscii-8/XI18N_OBJS
@ -49,11 +49,11 @@ drwxr-xr-x root/root usr/share/X11/locale/armscii-8/
drwxr-xr-x root/root usr/share/X11/locale/cs_CZ.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/cs_CZ.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/cs_CZ.UTF-8/XI18N_OBJS (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/cs_CZ.UTF-8/XLC_LOCALE
-rw-r--r-- root/root usr/share/X11/locale/cs_CZ.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/el_GR.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/el_GR.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/el_GR.UTF-8/XI18N_OBJS (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE
-rw-r--r-- root/root usr/share/X11/locale/el_GR.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/en_US.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/en_US.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/en_US.UTF-8/XI18N_OBJS
@ -61,7 +61,7 @@ drwxr-xr-x root/root usr/share/X11/locale/en_US.UTF-8/
drwxr-xr-x root/root usr/share/X11/locale/fi_FI.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/fi_FI.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/fi_FI.UTF-8/XI18N_OBJS (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE
-rw-r--r-- root/root usr/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/georgian-academy/
-rw-r--r-- root/root usr/share/X11/locale/georgian-academy/Compose
-rw-r--r-- root/root usr/share/X11/locale/georgian-academy/XI18N_OBJS
@ -75,11 +75,11 @@ drwxr-xr-x root/root usr/share/X11/locale/ibm-cp1133/
-rw-r--r-- root/root usr/share/X11/locale/ibm-cp1133/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/ibm-cp1133/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/iscii-dev/
-rw-r--r-- root/root usr/share/X11/locale/iscii-dev/Compose
-rw-r--r-- root/root usr/share/X11/locale/iscii-dev/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/iscii-dev/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/iscii-dev/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/isiri-3342/
-rw-r--r-- root/root usr/share/X11/locale/isiri-3342/Compose
-rw-r--r-- root/root usr/share/X11/locale/isiri-3342/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/isiri-3342/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/isiri-3342/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/iso8859-1/
@ -91,7 +91,7 @@ drwxr-xr-x root/root usr/share/X11/locale/iso8859-10/
-rw-r--r-- root/root usr/share/X11/locale/iso8859-10/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/iso8859-10/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/iso8859-11/
-rw-r--r-- root/root usr/share/X11/locale/iso8859-11/Compose
-rw-r--r-- root/root usr/share/X11/locale/iso8859-11/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/iso8859-11/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/iso8859-11/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/iso8859-13/
@ -161,7 +161,7 @@ drwxr-xr-x root/root usr/share/X11/locale/ja_JP.UTF-8/
drwxr-xr-x root/root usr/share/X11/locale/km_KH.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/km_KH.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/km_KH.UTF-8/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/km_KH.UTF-8/XLC_LOCALE
-rw-r--r-- root/root usr/share/X11/locale/km_KH.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/ko/
-rw-r--r-- root/root usr/share/X11/locale/ko/Compose
-rw-r--r-- root/root usr/share/X11/locale/ko/XI18N_OBJS
@ -185,15 +185,15 @@ drwxr-xr-x root/root usr/share/X11/locale/koi8-u/
-rw-r--r-- root/root usr/share/X11/locale/locale.alias
-rw-r--r-- root/root usr/share/X11/locale/locale.dir
drwxr-xr-x root/root usr/share/X11/locale/microsoft-cp1251/
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1251/Compose
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1251/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1251/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1251/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/microsoft-cp1255/
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1255/Compose
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1255/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1255/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1255/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/microsoft-cp1256/
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1256/Compose
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1256/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1256/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/microsoft-cp1256/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/mulelao-1/
@ -201,7 +201,7 @@ drwxr-xr-x root/root usr/share/X11/locale/mulelao-1/
-rw-r--r-- root/root usr/share/X11/locale/mulelao-1/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/mulelao-1/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/nokhchi-1/
-rw-r--r-- root/root usr/share/X11/locale/nokhchi-1/Compose
-rw-r--r-- root/root usr/share/X11/locale/nokhchi-1/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/nokhchi-1/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/nokhchi-1/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/pt_BR.UTF-8/
@ -216,12 +216,12 @@ drwxr-xr-x root/root usr/share/X11/locale/ru_RU.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/ru_RU.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/sr_CS.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/sr_CS.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/sr_CS.UTF-8/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/sr_CS.UTF-8/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/sr_RS.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/sr_RS.UTF-8/Compose
-rw-r--r-- root/root usr/share/X11/locale/sr_RS.UTF-8/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/sr_RS.UTF-8/XLC_LOCALE (EMPTY)
drwxr-xr-x root/root usr/share/X11/locale/tatar-cyr/
-rw-r--r-- root/root usr/share/X11/locale/tatar-cyr/Compose
-rw-r--r-- root/root usr/share/X11/locale/tatar-cyr/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/tatar-cyr/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/tatar-cyr/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/th_TH.UTF-8/
@ -229,11 +229,11 @@ drwxr-xr-x root/root usr/share/X11/locale/th_TH.UTF-8/
-rw-r--r-- root/root usr/share/X11/locale/th_TH.UTF-8/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/th_TH.UTF-8/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/th_TH/
-rw-r--r-- root/root usr/share/X11/locale/th_TH/Compose
-rw-r--r-- root/root usr/share/X11/locale/th_TH/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/th_TH/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/th_TH/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/tscii-0/
-rw-r--r-- root/root usr/share/X11/locale/tscii-0/Compose
-rw-r--r-- root/root usr/share/X11/locale/tscii-0/Compose (EMPTY)
-rw-r--r-- root/root usr/share/X11/locale/tscii-0/XI18N_OBJS
-rw-r--r-- root/root usr/share/X11/locale/tscii-0/XLC_LOCALE
drwxr-xr-x root/root usr/share/X11/locale/vi_VN.tcvn/

View File

@ -1,5 +1,5 @@
untrusted comment: verify with /etc/ports/xorg.pub
RWTSGWF5Q7TndN2s1eFlxBrWh22uhpm2CDBJnZ+CRRAljQlQ4F8ce8Qna2gJZLBGr6I7UI95iF4U6L1jJWwat5Bn8YkaBTK2aA4=
SHA256 (Pkgfile) = 83a4996fb7bca76974ab582adcb374f0983fd31a0528d53393e1fd47fdcb0870
SHA256 (.footprint) = ccb5120a2b76cd91ac3aa131a2de98674a22f34e0c7197ad2d98e41cb78f8775
SHA256 (libX11-1.6.12.tar.bz2) = f108227469419ac04d196df0f3b80ce1f7f65059bb54c0de811f4d8e03fd6ec7
RWTSGWF5Q7TndBadtpSPlIbnuNyLqVUO9rs515lQopJuNSNabSkzZB1WMZ8DFS6BPX2D9bvFgsLMhreeVjMLNLZbDPWLewGMKgs=
SHA256 (Pkgfile) = 85de6d47fe3534d9e8d0ca4cb8b5d92bcd4ebb698d13adde4e4de6c43ca417bb
SHA256 (.footprint) = 63ced358e03505394f076a68be0e08a228628a70fac192e3a162ee09be4bbab0
SHA256 (libX11-1.7.0.tar.bz2) = 36c8f93b6595437c8cfbc9f08618bcb3041cbd303e140a0013f88e4c2977cb54

View File

@ -4,7 +4,7 @@
# Depends on: xorg-libxcb xorg-xtrans
name=xorg-libx11
version=1.6.12
version=1.7.0
release=1
source=(https://www.x.org/releases/individual/lib/libX11-$version.tar.bz2)
@ -19,5 +19,5 @@ build() {
# Conflict with xorg-xorgproto
rm $PKG/usr/include/X11/extensions/XKBgeom.h
rm -rf $PKG/usr/share/doc
rm -r $PKG/usr/share/doc
}