wok-current rev 14636

Xorg marathon, Day 2. xorg-trapproto: fix receipt; xorg-libXau(-dev): up 1.0.8; xorg-xtrans: prettify receipt; xorg-libX11: move X11 locales to locale-*; slitaz-i18n: add function get_x11_locale; locale-el: add receipt; locale-pt_BR locale-ru locale-zh_CN locale-zh_TW: add here X11 locales.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Sun Jun 02 12:09:39 2013 +0000 (2013-06-02)
parents 132d3416b188
children 303cc9eb28c5
files locale-el/receipt locale-pt_BR/receipt locale-ru/receipt locale-zh_CN/receipt locale-zh_TW/receipt slitaz-i18n/stuff/locale-pack.functions xorg-libX11-dev/receipt xorg-libX11/receipt xorg-libXau-dev/receipt xorg-libXau/receipt xorg-trapproto/receipt xorg-xtrans/receipt
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/locale-el/receipt	Sun Jun 02 12:09:39 2013 +0000
     1.3 @@ -0,0 +1,36 @@
     1.4 +# SliTaz package receipt
     1.5 +
     1.6 +PACKAGE="locale-el"
     1.7 +VERSION="4.0"
     1.8 +CATEGORY="system-tools"
     1.9 +SHORT_DESC="Greek locale pack"
    1.10 +MAINTAINER="al.bobylev@gmail.com"
    1.11 +WEB_SITE="http://www.slitaz.org/"
    1.12 +
    1.13 +WANTED="slitaz-i18n xorg-libX11"
    1.14 +DEPENDS="glibc-base"
    1.15 +BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
    1.16 +
    1.17 +LOCALE="el"
    1.18 +LOCALEDEF="el_GR"
    1.19 +CHARMAP="UTF-8"
    1.20 +
    1.21 +# Rules to gen a SliTaz package suitable for Tazpkg.
    1.22 +genpkg_rules()
    1.23 +{
    1.24 +	. $WOK/slitaz-i18n/stuff/locale-pack.functions
    1.25 +	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    1.26 +	mk_locale_dir
    1.27 +	get_slitaz_messages
    1.28 +	get_core_messages
    1.29 +	get_x11_locale
    1.30 +}
    1.31 +
    1.32 +# Back to C if it's the last used locale.
    1.33 +post_remove()
    1.34 +{
    1.35 +	if grep -q $LOCALEDEF /etc/locale.conf; then
    1.36 +		echo "LANG=C" > /etc/locale.conf
    1.37 +		echo "LC_ALL=C" >> /etc/locale.conf
    1.38 +	fi
    1.39 +}
     2.1 --- a/locale-pt_BR/receipt	Sun Jun 02 07:16:29 2013 +0200
     2.2 +++ b/locale-pt_BR/receipt	Sun Jun 02 12:09:39 2013 +0000
     2.3 @@ -5,10 +5,11 @@
     2.4  CATEGORY="system-tools"
     2.5  SHORT_DESC="Portuguese/Brazilian locale pack."
     2.6  MAINTAINER="pankso@slitaz.org"
     2.7 +WEB_SITE="http://www.slitaz.org/"
     2.8 +
     2.9 +WANTED="slitaz-i18n xorg-libX11"
    2.10  DEPENDS="glibc-base"
    2.11  BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
    2.12 -WEB_SITE="http://www.slitaz.org/"
    2.13 -WANTED="slitaz-i18n"
    2.14  
    2.15  LOCALE="pt_BR"
    2.16  LOCALEDEF="pt_BR"
    2.17 @@ -22,6 +23,7 @@
    2.18  	mk_locale_dir
    2.19  	get_slitaz_messages
    2.20  	get_core_messages
    2.21 +	get_x11_locale
    2.22  }
    2.23  
    2.24  # Back to C if it's the last used locale.
     3.1 --- a/locale-ru/receipt	Sun Jun 02 07:16:29 2013 +0200
     3.2 +++ b/locale-ru/receipt	Sun Jun 02 12:09:39 2013 +0000
     3.3 @@ -5,10 +5,11 @@
     3.4  CATEGORY="system-tools"
     3.5  SHORT_DESC="Russian locale pack."
     3.6  MAINTAINER="pankso@slitaz.org"
     3.7 +WEB_SITE="http://www.slitaz.org/"
     3.8 +
     3.9 +WANTED="slitaz-i18n xorg-libX11"
    3.10  DEPENDS="glibc-base"
    3.11  BUILD_DEPENDS="glibc glibc-locale slitaz-i18n"
    3.12 -WEB_SITE="http://www.slitaz.org/"
    3.13 -WANTED="slitaz-i18n"
    3.14  
    3.15  LOCALE="ru"
    3.16  LOCALEDEF="ru_RU"
    3.17 @@ -22,6 +23,7 @@
    3.18  	mk_locale_dir
    3.19  	get_slitaz_messages
    3.20  	get_core_messages
    3.21 +	get_x11_locale
    3.22  }
    3.23  
    3.24  # Back to C if it's the last used locale.
     4.1 --- a/locale-zh_CN/receipt	Sun Jun 02 07:16:29 2013 +0200
     4.2 +++ b/locale-zh_CN/receipt	Sun Jun 02 12:09:39 2013 +0000
     4.3 @@ -5,9 +5,11 @@
     4.4  CATEGORY="system-tools"
     4.5  SHORT_DESC="Chinese Simplified locale pack."
     4.6  MAINTAINER="lufeng369@slitaz.org"
     4.7 +WEB_SITE="http://www.slitaz.org/"
     4.8 +
     4.9 +WANTED="slitaz-i18n xorg-libX11"
    4.10  DEPENDS="glibc-base wqy-microhei"
    4.11 -BUILD_DEPENDS="glibc-locale xorg-libX11"
    4.12 -WEB_SITE="http://www.slitaz.org/"
    4.13 +BUILD_DEPENDS="glibc-locale xorg-libX11 slitaz-i18n"
    4.14  
    4.15  LOCALE="zh_CN"
    4.16  LOCALEDEF="zh_CN"
    4.17 @@ -17,6 +19,9 @@
    4.18  # Genereted locale files are in /usr/lib/locale.
    4.19  genpkg_rules()
    4.20  {
    4.21 +	. $WOK/slitaz-i18n/stuff/locale-pack.functions
    4.22 +	. $WOK/slitaz-i18n/stuff/locale-pack.conf
    4.23 +
    4.24  	mkdir -p $fs/usr/share/locale/$LOCALE $fs/usr/lib/locale
    4.25  	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF.UTF-8
    4.26  
    4.27 @@ -38,6 +43,8 @@
    4.28  		$fs/usr/share/posix/zoneinfo/Asia/Shanghai -m 644
    4.29  	install  -D /usr/share/zoneinfo/right/Asia/Shanghai \
    4.30  		$fs/usr/share/right/zoneinfo/Asia/Shanghai -m 644
    4.31 +
    4.32 +	get_x11_locale
    4.33  }
    4.34  
    4.35  post_install()
     5.1 --- a/locale-zh_TW/receipt	Sun Jun 02 07:16:29 2013 +0200
     5.2 +++ b/locale-zh_TW/receipt	Sun Jun 02 12:09:39 2013 +0000
     5.3 @@ -5,10 +5,11 @@
     5.4  CATEGORY="system-tools"
     5.5  SHORT_DESC="Chinese Traditional locale pack."
     5.6  MAINTAINER="pankso@slitaz.org"
     5.7 +WEB_SITE="http://www.slitaz.org/"
     5.8 +
     5.9 +WANTED="slitaz-i18n xorg-libX11"
    5.10  DEPENDS="glibc-base pcf-uming"
    5.11  BUILD_DEPENDS="glibc glibc-locale xorg-libX11"
    5.12 -WEB_SITE="http://www.slitaz.org/"
    5.13 -WANTED="slitaz-i18n"
    5.14  
    5.15  LOCALE="zh_TW"
    5.16  LOCALEDEF="zh_TW"
    5.17 @@ -23,6 +24,7 @@
    5.18  	mk_locale_dir
    5.19  	get_slitaz_messages
    5.20  	get_core_messages
    5.21 +	get_x11_locale
    5.22  	# Pregenerate locale file so we dont need glibc-locale as dep.
    5.23  	mkdir -p $fs/usr/lib/locale
    5.24  	localedef -i $LOCALEDEF -c -f $CHARMAP $fs/usr/lib/locale/$LOCALEDEF
     6.1 --- a/slitaz-i18n/stuff/locale-pack.functions	Sun Jun 02 07:16:29 2013 +0200
     6.2 +++ b/slitaz-i18n/stuff/locale-pack.functions	Sun Jun 02 12:09:39 2013 +0000
     6.3 @@ -61,3 +61,11 @@
     6.4  		fi
     6.5  	done
     6.6  }
     6.7 +
     6.8 +# Get X11 locale
     6.9 +get_x11_locale()
    6.10 +{
    6.11 +	mkdir -p $fs/usr/share/X11/locale
    6.12 +	cp -a $WOK/xorg-libX11/install/usr/share/X11/locale/$LOCALEDEF.$CHARMAP \
    6.13 +		$fs/usr/share/X11/locale
    6.14 +}
     7.1 --- a/xorg-libX11-dev/receipt	Sun Jun 02 07:16:29 2013 +0200
     7.2 +++ b/xorg-libX11-dev/receipt	Sun Jun 02 12:09:39 2013 +0000
     7.3 @@ -3,20 +3,24 @@
     7.4  PACKAGE="xorg-libX11-dev"
     7.5  VERSION="1.5.99.902"
     7.6  CATEGORY="development"
     7.7 -SHORT_DESC="Xorg module devel files."
     7.8 +SHORT_DESC="Development files for libX11"
     7.9  MAINTAINER="pankso@slitaz.org"
    7.10 -WANTED="xorg-libX11"
    7.11 -SOURCE="libX11"
    7.12 +LICENSE="other"
    7.13  WEB_SITE="http://www.x.org/"
    7.14  
    7.15 -DEPENDS="xorg-libX11 xorg-xtrans libxcb-dev xorg-kbproto \
    7.16 -xorg-inputproto xorg-xextproto"
    7.17 +WANTED="xorg-libX11"
    7.18 +DEPENDS="xorg-libX11 xorg-xtrans libxcb-dev xorg-kbproto xorg-inputproto \
    7.19 +xorg-xextproto"
    7.20  
    7.21  # Rules to gen a SliTaz package suitable for Tazpkg.
    7.22  genpkg_rules()
    7.23  {
    7.24 -	mkdir -p $fs/usr/lib
    7.25 -	cp -a $install/usr/lib/*.*a* $fs/usr/lib
    7.26 +	mkdir -p \
    7.27 +		$fs/usr/share/licenses \
    7.28 +		$fs/usr/lib
    7.29 +	cp -a $src/COPYING $fs/usr/share/licenses/${PACKAGE%-dev}.txt
    7.30 +
    7.31 +	cp -a $install/usr/include $fs/usr
    7.32  	cp -a $install/usr/lib/pkgconfig $fs/usr/lib
    7.33 -	cp -a $install/usr/include $fs/usr
    7.34 +	cp -a $install/usr/lib/*.la $fs/usr/lib
    7.35  }
     8.1 --- a/xorg-libX11/receipt	Sun Jun 02 07:16:29 2013 +0200
     8.2 +++ b/xorg-libX11/receipt	Sun Jun 02 12:09:39 2013 +0000
     8.3 @@ -3,44 +3,40 @@
     8.4  PACKAGE="xorg-libX11"
     8.5  VERSION="1.5.99.902"
     8.6  CATEGORY="x-window"
     8.7 -SHORT_DESC="X11 main client interface to X window system."
     8.8 +SHORT_DESC="X Library"
     8.9  MAINTAINER="pankso@slitaz.org"
    8.10 -SOURCE="libX11"
    8.11 -TARBALL="$SOURCE-$VERSION.tar.bz2"
    8.12 +LICENSE="other"
    8.13  WEB_SITE="http://www.x.org/"
    8.14 +TARBALL="${PACKAGE#xorg-}-$VERSION.tar.bz2"
    8.15  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
    8.16  
    8.17  DEPENDS="libxcb"
    8.18 -BUILD_DEPENDS="xorg-xtrans libxcb-dev pkg-config xorg-kbproto \
    8.19 +BUILD_DEPENDS="xorg-xtrans libxcb-dev xorg-kbproto xorg-xf86bigfontproto \
    8.20  xorg-inputproto xorg-xextproto"
    8.21  
    8.22  # Rules to configure and make the package.
    8.23  compile_rules()
    8.24  {
    8.25 -	cd $src
    8.26 -	sed -i 's/^# keys/keys/' man/xkb/XkbGetKeyVirtualModMap.man
    8.27  	./configure \
    8.28 -		--prefix=/usr \
    8.29  		--sysconfdir=/etc \
    8.30 -		--mandir=/usr/share/man \
    8.31  		--localstatedir=/var \
    8.32 +		--disable-static \
    8.33  		$CONFIGURE_ARGS &&
    8.34 -	make && make install
    8.35 +	make &&
    8.36 +	make install
    8.37  }
    8.38  
    8.39  # Rules to gen a SliTaz package suitable for Tazpkg.
    8.40  genpkg_rules()
    8.41  {
    8.42 -	mkdir -p $fs/usr/lib $fs/usr/share/X11/locale
    8.43 -	
    8.44 +	mkdir -p \
    8.45 +		$fs/usr/lib \
    8.46 +		$fs/usr/share/X11/locale
    8.47 +
    8.48  	cp -a $install/usr/lib/*.so* $fs/usr/lib
    8.49 -	cp -a $install/usr/share/X11/*DB $fs/usr/share/X11
    8.50 -	
    8.51 -	# X11 locale.
    8.52 -	for i in C iso8859-1 en_US.UTF-8 ko_KR.UTF-8 pt_BR.UTF-8 zh_TW.UTF-8 zh_CN.UTF-8
    8.53 -	do
    8.54 +	cp -a $install/usr/share/X11/X* $fs/usr/share/X11
    8.55 +	# X11 locale; other moved to locale packs
    8.56 +	for i in C en_US.UTF-8 compose.dir locale.alias locale.dir; do
    8.57  		cp -a $install/usr/share/X11/locale/$i $fs/usr/share/X11/locale
    8.58  	done
    8.59 -	cp -a $install/usr/share/X11/locale/*.dir $fs/usr/share/X11/locale
    8.60 -	cp -a $install/usr/share/X11/locale/*.alias $fs/usr/share/X11/locale
    8.61  }
     9.1 --- a/xorg-libXau-dev/receipt	Sun Jun 02 07:16:29 2013 +0200
     9.2 +++ b/xorg-libXau-dev/receipt	Sun Jun 02 12:09:39 2013 +0000
     9.3 @@ -1,7 +1,7 @@
     9.4  # SliTaz package receipt.
     9.5  
     9.6  PACKAGE="xorg-libXau-dev"
     9.7 -VERSION="1.0.7"
     9.8 +VERSION="1.0.8"
     9.9  CATEGORY="development"
    9.10  SHORT_DESC="Development files for libXau"
    9.11  MAINTAINER="pankso@slitaz.org"
    10.1 --- a/xorg-libXau/receipt	Sun Jun 02 07:16:29 2013 +0200
    10.2 +++ b/xorg-libXau/receipt	Sun Jun 02 12:09:39 2013 +0000
    10.3 @@ -1,7 +1,7 @@
    10.4  # SliTaz package receipt.
    10.5  
    10.6  PACKAGE="xorg-libXau"
    10.7 -VERSION="1.0.7"
    10.8 +VERSION="1.0.8"
    10.9  CATEGORY="x-window"
   10.10  SHORT_DESC="X authorization file management libary"
   10.11  MAINTAINER="pankso@slitaz.org"
    11.1 --- a/xorg-trapproto/receipt	Sun Jun 02 07:16:29 2013 +0200
    11.2 +++ b/xorg-trapproto/receipt	Sun Jun 02 12:09:39 2013 +0000
    11.3 @@ -10,9 +10,7 @@
    11.4  TARBALL="${PACKAGE#xorg-}-$VERSION.tar.bz2"
    11.5  WGET_URL="$XORG_MIRROR/proto/$TARBALL"
    11.6  
    11.7 -DEPENDS="xorg-libX11-dev xorg-server-dev xorg-xproto"
    11.8 -# /usr/include/X11/extensions/xtraplib.h:	#include <X11/Intrinsic.h>			?
    11.9 -# /usr/lib/pkgconfigtrapproto.pc:			Requires: xt.pc						?
   11.10 +DEPENDS="xorg-server-dev xorg-libXt-dev"
   11.11  BUILD_DEPENDS="xorg-util-macros"
   11.12  
   11.13  # Rules to configure and make the package.
    12.1 --- a/xorg-xtrans/receipt	Sun Jun 02 07:16:29 2013 +0200
    12.2 +++ b/xorg-xtrans/receipt	Sun Jun 02 12:09:39 2013 +0000
    12.3 @@ -3,30 +3,33 @@
    12.4  PACKAGE="xorg-xtrans"
    12.5  VERSION="1.2.7"
    12.6  CATEGORY="development"
    12.7 -SHORT_DESC="Xorg library to handle network protocol transport in a modular fashion."
    12.8 +SHORT_DESC="Abstract network code for X"
    12.9  MAINTAINER="pankso@slitaz.org"
   12.10 -SOURCE="xtrans"
   12.11 -TARBALL="$SOURCE-$VERSION.tar.bz2"
   12.12 +LICENSE="other"
   12.13  WEB_SITE="http://www.x.org/"
   12.14 +TARBALL="${PACKAGE#xorg-}-$VERSION.tar.bz2"
   12.15  WGET_URL="$XORG_MIRROR/lib/$TARBALL"
   12.16  
   12.17 -DEPENDS="xorg-util-macros"
   12.18 +DEPENDS="xorg-xproto"
   12.19  BUILD_DEPENDS="xorg-util-macros"
   12.20  
   12.21  # Rules to configure and make the package.
   12.22  compile_rules()
   12.23  {
   12.24 -	cd $src
   12.25  	./configure \
   12.26  		--sysconfdir=/etc \
   12.27 -		--mandir=/usr/share/man \
   12.28  		--localstatedir=/var \
   12.29  		$CONFIGURE_ARGS &&
   12.30 -	make && make install
   12.31 +	make &&
   12.32 +	make install
   12.33  }
   12.34  
   12.35  # Rules to gen a SliTaz package suitable for Tazpkg.
   12.36  genpkg_rules()
   12.37  {
   12.38 +	mkdir -p $fs/usr/share/licenses
   12.39 +	cp -a $src/COPYING $fs/usr/share/licenses/$PACKAGE.txt
   12.40 +
   12.41  	cp -a $install/* $fs
   12.42 +	rm -rf $fs/usr/share/doc
   12.43  }