Index: X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile
===================================================================
--- X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile (revision 670)
+++ X.org/driver/xf86-video-mali/DX/r3p0-04rel0/0.4.2/Makefile (revision 671)
@@ -99,7 +99,8 @@
$(APPLY_PATCHES)
@( cd $(SRC_DIR) ; \
sed -i "s,^\(MALI_DDK=\).*,\1 \"$(TARGET_DEST_DIR)/usr\"," src/Makefile.am ; \
- automake ; \
+ touch NEWS README AUTHORS ; autoreconf -fi ; automake --add-missing --copy ; \
+ rm -rf autom4te.cache config.h.in~ ; \
)
@touch $@
@@ -136,7 +137,7 @@
$(XORG_PKG)/usr/doc/$(src_dir_name)
@mkdir -p $(XORG_PKG)/usr/share/doc/$(src_dir_name)
@( cd $(SRC_DIR) ; \
- cp -a $(license) README* xorg.conf \
+ cp -a $(license) README.txt xorg.conf \
$(XORG_PKG)/usr/share/doc/$(src_dir_name) \
)
@( cd $(XORG_PKG)/usr/share/doc ; \
Index: X.org/font/encodings/1.0.4/Makefile
===================================================================
--- X.org/font/encodings/1.0.4/Makefile (revision 670)
+++ X.org/font/encodings/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/encodings
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-adobe-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-adobe-100dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-adobe-100dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-adobe-100dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-adobe-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-adobe-75dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-adobe-75dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-adobe-75dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile (revision 670)
+++ X.org/font/font-adobe-utopia-100dpi/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-adobe-utopia-100dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile (revision 670)
+++ X.org/font/font-adobe-utopia-75dpi/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-adobe-utopia-75dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-adobe-utopia-type1/1.0.4/Makefile
===================================================================
--- X.org/font/font-adobe-utopia-type1/1.0.4/Makefile (revision 670)
+++ X.org/font/font-adobe-utopia-type1/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-adobe-utopia-type1
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-alias/1.0.3/Makefile
===================================================================
--- X.org/font/font-alias/1.0.3/Makefile (revision 670)
+++ X.org/font/font-alias/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-alias
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-arabic-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-arabic-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-arabic-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-arabic-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-100dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-100dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-100dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-75dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-75dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-75dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-lucidatypewriter-100dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-lucidatypewriter-100dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-lucidatypewriter-75dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-lucidatypewriter-75dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-ttf/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-ttf/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-ttf/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-ttf
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bh-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-bh-type1/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bh-type1/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bh-type1
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bitstream-100dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-100dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bitstream-100dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bitstream-100dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bitstream-75dpi/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-75dpi/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bitstream-75dpi/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bitstream-75dpi
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bitstream-speedo/1.0.2/Makefile
===================================================================
--- X.org/font/font-bitstream-speedo/1.0.2/Makefile (revision 670)
+++ X.org/font/font-bitstream-speedo/1.0.2/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bitstream-speedo
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-bitstream-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-bitstream-type1/1.0.3/Makefile (revision 670)
+++ X.org/font/font-bitstream-type1/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-bitstream-type1
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-cronyx-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-cronyx-cyrillic/1.0.3/Makefile (revision 670)
+++ X.org/font/font-cronyx-cyrillic/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-cronyx-cyrillic
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-cursor-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-cursor-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-cursor-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-cursor-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-daewoo-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-daewoo-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-daewoo-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-daewoo-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-dec-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-dec-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-dec-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-dec-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-ibm-type1/1.0.3/Makefile
===================================================================
--- X.org/font/font-ibm-type1/1.0.3/Makefile (revision 670)
+++ X.org/font/font-ibm-type1/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-ibm-type1
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-isas-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-isas-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-isas-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-isas-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-jis-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-jis-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-jis-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-jis-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-micro-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-micro-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-micro-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-micro-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-misc-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-cyrillic/1.0.3/Makefile (revision 670)
+++ X.org/font/font-misc-cyrillic/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-misc-cyrillic
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-misc-ethiopic/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-ethiopic/1.0.3/Makefile (revision 670)
+++ X.org/font/font-misc-ethiopic/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-misc-ethiopic
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-misc-meltho/1.0.3/Makefile
===================================================================
--- X.org/font/font-misc-meltho/1.0.3/Makefile (revision 670)
+++ X.org/font/font-misc-meltho/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-misc-meltho
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-misc-misc/1.1.2/Makefile
===================================================================
--- X.org/font/font-misc-misc/1.1.2/Makefile (revision 670)
+++ X.org/font/font-misc-misc/1.1.2/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-misc-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-mutt-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-mutt-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-mutt-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-mutt-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-schumacher-misc/1.1.2/Makefile
===================================================================
--- X.org/font/font-schumacher-misc/1.1.2/Makefile (revision 670)
+++ X.org/font/font-schumacher-misc/1.1.2/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-schumacher-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-screen-cyrillic/1.0.4/Makefile
===================================================================
--- X.org/font/font-screen-cyrillic/1.0.4/Makefile (revision 670)
+++ X.org/font/font-screen-cyrillic/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-screen-cyrillic
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-sony-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-sony-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-sony-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-sony-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-sun-misc/1.0.3/Makefile
===================================================================
--- X.org/font/font-sun-misc/1.0.3/Makefile (revision 670)
+++ X.org/font/font-sun-misc/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-sun-misc
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-winitzki-cyrillic/1.0.3/Makefile
===================================================================
--- X.org/font/font-winitzki-cyrillic/1.0.3/Makefile (revision 670)
+++ X.org/font/font-winitzki-cyrillic/1.0.3/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-winitzki-cyrillic
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/font/font-xfree86-type1/1.0.4/Makefile
===================================================================
--- X.org/font/font-xfree86-type1/1.0.4/Makefile (revision 670)
+++ X.org/font/font-xfree86-type1/1.0.4/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/X.org/font/font-xfree86-type1
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: X.org/lib/libXft/2.3.2/Makefile
===================================================================
--- X.org/lib/libXft/2.3.2/Makefile (revision 670)
+++ X.org/lib/libXft/2.3.2/Makefile (revision 671)
@@ -31,7 +31,7 @@
SOURCE_REQUIRES = sources/X.org/lib/libXft
REQUIRES = libs/freetype/2.6.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXrender/0.9.9
# ======= __END_OF_REQUIRES__ =======
Index: X.org/lib/libXft/2.3.2-x86_32/Makefile
===================================================================
--- X.org/lib/libXft/2.3.2-x86_32/Makefile (revision 670)
+++ X.org/lib/libXft/2.3.2-x86_32/Makefile (revision 671)
@@ -14,7 +14,7 @@
REQUIRES = X11/X.org/lib/libXft/2.3.2
REQUIRES += libs/freetype/2.6.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXrender/0.9.9-x86_32
# ======= __END_OF_REQUIRES__ =======
Index: X.org/util/util-macros/1.19.0/Makefile
===================================================================
--- X.org/util/util-macros/1.19.0/Makefile (revision 670)
+++ X.org/util/util-macros/1.19.0/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/X.org/util/util-macros
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
Index: X.org/xcb/libpthread-stubs/0.3/Makefile
===================================================================
--- X.org/xcb/libpthread-stubs/0.3/Makefile (revision 670)
+++ X.org/xcb/libpthread-stubs/0.3/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/X.org/xcb/libpthread-stubs
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
Index: X.org/xserver/xorg-server/1.18.4/Makefile
===================================================================
--- X.org/xserver/xorg-server/1.18.4/Makefile (revision 670)
+++ X.org/xserver/xorg-server/1.18.4/Makefile (revision 671)
@@ -73,7 +73,7 @@
$(HARDWARE_ODROID_C2) \
$(HARDWARE_P212) $(HARDWARE_KHADAS_VIM) \
$(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
-REQUIRES += libs/libunwind/1.2
+REQUIRES += libs/libunwind/1.2.1
endif
REQUIRES += X11/libs/libdrm/2.4.68
Index: font/dejavu-fonts-ttf/2.35/Makefile
===================================================================
--- font/dejavu-fonts-ttf/2.35/Makefile (revision 670)
+++ font/dejavu-fonts-ttf/2.35/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/packages/x/dejavu-fonts-ttf
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: font/thaixfonts/1.2.7/Makefile
===================================================================
--- font/thaixfonts/1.2.7/Makefile (revision 670)
+++ font/thaixfonts/1.2.7/Makefile (revision 671)
@@ -30,7 +30,7 @@
SOURCE_REQUIRES = sources/packages/x/thaixfonts
-REQUIRES = X11/libs/fontconfig/2.11.95
+REQUIRES = X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/font/font-util/1.3.1
# ======= __END_OF_REQUIRES__ =======
Index: libs/cairo/1.14.0/Makefile
===================================================================
--- libs/cairo/1.14.0/Makefile (revision 670)
+++ libs/cairo/1.14.0/Makefile (revision 671)
@@ -33,7 +33,7 @@
REQUIRES = libs/lzo/2.09
REQUIRES += libs/pcre/8.38
REQUIRES += libs/glib2/2.48.0
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/pixman/0.34.0
REQUIRES += X11/X.org/lib/libXext/1.3.3
REQUIRES += X11/X.org/lib/libXrender/0.9.9
Index: libs/cairo/1.14.0-x86_32/Makefile
===================================================================
--- libs/cairo/1.14.0-x86_32/Makefile (revision 670)
+++ libs/cairo/1.14.0-x86_32/Makefile (revision 671)
@@ -16,7 +16,7 @@
REQUIRES += libs/lzo/2.09-x86_32
REQUIRES += libs/pcre/8.38-x86_32
REQUIRES += libs/glib2/2.48.0-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/pixman/0.34.0-x86_32
REQUIRES += X11/X.org/lib/libXext/1.3.3-x86_32
REQUIRES += X11/X.org/lib/libXrender/0.9.9-x86_32
Index: libs/cairo/1.14.6/Makefile
===================================================================
--- libs/cairo/1.14.6/Makefile (revision 670)
+++ libs/cairo/1.14.6/Makefile (revision 671)
@@ -33,7 +33,7 @@
REQUIRES = libs/lzo/2.09
REQUIRES += libs/pcre/8.38
REQUIRES += libs/glib2/2.48.0
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/pixman/0.34.0
REQUIRES += X11/X.org/lib/libXext/1.3.3
REQUIRES += X11/X.org/lib/libXrender/0.9.9
Index: libs/cairo/1.14.6-x86_32/Makefile
===================================================================
--- libs/cairo/1.14.6-x86_32/Makefile (revision 670)
+++ libs/cairo/1.14.6-x86_32/Makefile (revision 671)
@@ -16,7 +16,7 @@
REQUIRES += libs/lzo/2.09-x86_32
REQUIRES += libs/pcre/8.38-x86_32
REQUIRES += libs/glib2/2.48.0-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/pixman/0.34.0-x86_32
REQUIRES += X11/X.org/lib/libXext/1.3.3-x86_32
REQUIRES += X11/X.org/lib/libXrender/0.9.9-x86_32
Index: libs/ci20-sgx-um/1.13.3341330/Makefile
===================================================================
--- libs/ci20-sgx-um/1.13.3341330/Makefile (revision 670)
+++ libs/ci20-sgx-um/1.13.3341330/Makefile (revision 671)
@@ -12,7 +12,7 @@
SOURCE_REQUIRES = sources/hal/PowerVR/ci20/sgx-ddk/3.0.8
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += hal/drivers/ci20/sgx-ddk/3.0.8/1.13.3341330
REQUIRES += X11/libs/mesa/11.2.2
Index: libs/ci20-sgx-um/1.14.3759903/Makefile
===================================================================
--- libs/ci20-sgx-um/1.14.3759903/Makefile (revision 670)
+++ libs/ci20-sgx-um/1.14.3759903/Makefile (revision 671)
@@ -12,7 +12,7 @@
SOURCE_REQUIRES = sources/hal/PowerVR/ci20/sgx-ddk/3.18
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += hal/drivers/ci20/sgx-ddk/3.18/1.14.3759903
REQUIRES += X11/libs/mesa/11.2.2
Index: libs/fontconfig/2.12.4/Makefile
===================================================================
--- libs/fontconfig/2.12.4/Makefile (nonexistent)
+++ libs/fontconfig/2.12.4/Makefile (revision 671)
@@ -0,0 +1,247 @@
+
+COMPONENT_TARGETS = $(HARDWARE_PC32)
+COMPONENT_TARGETS += $(HARDWARE_PC64)
+COMPONENT_TARGETS += $(HARDWARE_CB1X)
+COMPONENT_TARGETS += $(HARDWARE_CB2X)
+COMPONENT_TARGETS += $(HARDWARE_CB3X)
+COMPONENT_TARGETS += $(HARDWARE_FFRK3288)
+COMPONENT_TARGETS += $(HARDWARE_M201)
+COMPONENT_TARGETS += $(HARDWARE_MXV)
+COMPONENT_TARGETS += $(HARDWARE_P201)
+COMPONENT_TARGETS += $(HARDWARE_NEXBOX_A95X)
+COMPONENT_TARGETS += $(HARDWARE_ODROID_C2)
+COMPONENT_TARGETS += $(HARDWARE_P212)
+COMPONENT_TARGETS += $(HARDWARE_KHADAS_VIM)
+COMPONENT_TARGETS += $(HARDWARE_Q201)
+COMPONENT_TARGETS += $(HARDWARE_ENYBOX_X2)
+COMPONENT_TARGETS += $(HARDWARE_NIT6Q)
+COMPONENT_TARGETS += $(HARDWARE_OMAP5UEVM)
+COMPONENT_TARGETS += $(HARDWARE_DRA7XXEVM)
+COMPONENT_TARGETS += $(HARDWARE_CI20)
+COMPONENT_TARGETS += $(HARDWARE_BT1)
+
+
+NEED_ABS_PATH = true
+COMPONENT_IS_3PP = true
+
+
+include ../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES = sources/packages/x/fontconfig
+
+REQUIRES = libs/expat/2.1.1
+REQUIRES += env/freetype/2.6.3
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version = 2.12.4
+tar_bz2_archive = $(SRC_PACKAGE_PATH)/packages/x/fontconfig/fontconfig-$(version).tar.bz2
+SRC_ARCHIVE = $(tar_bz2_archive)
+SRC_DIR = $(TARGET_BUILD_DIR)/fontconfig-$(version)
+src_dir_name = fontconfig-$(version)
+src_done = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir = $(TARGET_BUILD_DIR)/build
+build_target = $(TARGET_BUILD_DIR)/.build_done
+install_target = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xlibs
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+FONTCFG_PKG_NAME = fontconfig
+FONTCFG_PKG_VERSION = 2.12.4
+FONTCFG_PKG_ARCH = $(TOOLCHAIN)
+FONTCFG_PKG_DISTRO_NAME = $(DISTRO_NAME)
+FONTCFG_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+FONTCFG_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+FONTCFG_PKG_SHORT_DESCRIPTION = Font library and tools
+FONTCFG_PKG_URL = $(BUG_URL)
+FONTCFG_PKG_LICENSE = custom
+FONTCFG_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(FONTCFG_PKG_NAME)-pkg-description
+FONTCFG_PKG_DESCRIPTION_FILE_IN = $(FONTCFG_PKG_NAME)-pkg-description.in
+FONTCFG_PKG_INSTALL_SCRIPT = $(FONTCFG_PKG_NAME)-pkg-install.sh
+
+FONTCFG_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(FONTCFG_PKG_NAME)-package
+
+pkg_basename = $(FONTCFG_PKG_NAME)-$(FONTCFG_PKG_VERSION)-$(FONTCFG_PKG_ARCH)-$(FONTCFG_PKG_DISTRO_NAME)-$(FONTCFG_PKG_DISTRO_VERSION)
+
+pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature = $(call sign-name,$(pkg_archive))
+pkg_description = $(call desc-name,$(pkg_archive))
+products = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS = $(build_target)
+BUILD_TARGETS += $(install_target)
+
+PRODUCT_TARGETS = $(products)
+
+ROOTFS_TARGETS = $(pkg_archive)
+
+
+include ../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(FONTCFG_PKG)
+
+
+extra_configure_switches = --libdir=/usr/lib$(LIBSUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --with-templatedir=/etc/fonts/conf.avai
+extra_configure_switches += --with-baseconfigdir=/etc/fonts
+extra_configure_switches += --with-configdir=/etc/fonts/conf.d
+extra_configure_switches += --with-xmldir=/etc/fonts
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX)
+TARGET_LIB_RPATH = /lib$(LIBSUFFIX):/usr/lib$(LIBSUFFIX):/usr/lib/../lib$(LIBSUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+ $(UNPACK_SRC_ARCHIVE)
+ $(APPLY_PATCHES)
+ @( cd $(SRC_DIR) ; \
+ rm -f src/fcobjshash.gperf src/fcobjshash.h ; \
+ )
+ @touch $@
+
+$(build_target): $(src_done)
+ @mkdir -p $(build_dir)
+ @cd $(build_dir) && \
+ $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ --prefix=/usr \
+ --build=$(BUILD) \
+ --host=$(TARGET) \
+ $(extra_configure_switches)
+ # ======= trick the Makefile.am developers =======
+ @( cd $(build_dir)/doc ; \
+ gcc -c -o edit-sgml.o $(CURDIR)/$(SRC_DIR)/doc/edit-sgml.c ; \
+ gcc -o edit-sgml edit-sgml.o ; \
+ )
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ @touch $@
+
+$(install_target): $(build_target)
+ @mkdir -p $(FONTCFG_PKG)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ # ======= Relinking etc/fonts/conf.d/*.conf =======
+ @( cd $(FONTCFG_PKG)/etc/fonts/conf.d ; \
+ for file in `find . -type l` ; do \
+ file=`basename $$file` ; rm -f $$file ; ln -sf ../conf.avai/$$file $$file ; \
+ done \
+ )
+ # ======= Install Documentation =======
+ @if [ -d $(FONTCFG_PKG)/usr/share/man ]; then \
+ ( cd $(FONTCFG_PKG)/usr/share/man ; \
+ for manpagedir in `find . -type d -name "man*"` ; do \
+ ( cd $$manpagedir ; \
+ for eachpage in `find . -type l -maxdepth 1` ; do \
+ ln -s `readlink $$eachpage`.gz $$eachpage.gz ; \
+ rm $$eachpage ; \
+ done ; \
+ gzip -9 *.? ; \
+ ) \
+ done \
+ ) \
+ fi
+ @mkdir -p $(FONTCFG_PKG)/usr/doc/$(src_dir_name)
+ @cp -a $(SRC_DIR)/AUTHORS $(SRC_DIR)/COPYING* \
+ $(FONTCFG_PKG)/usr/doc/$(src_dir_name)
+ @mkdir -p $(FONTCFG_PKG)/usr/share/doc/$(src_dir_name)
+ @( cd $(SRC_DIR) ; \
+ cp -a AUTHORS COPYING INSTALL README \
+ $(FONTCFG_PKG)/usr/share/doc/$(src_dir_name) ; \
+ )
+ @( cd $(SRC_DIR) ; \
+ if [ -r ChangeLog ]; then \
+ DOCSDIR=`echo $(FONTCFG_PKG)/usr/share/doc/$(src_dir_name)` ; \
+ cat ChangeLog | head -n 1000 > $$DOCSDIR/ChangeLog ; \
+ touch -r ChangeLog $$DOCSDIR/ChangeLog ; \
+ fi \
+ )
+ # ======= remove toolchain path from target libtool *.la files =======
+ @( cd $(FONTCFG_PKG)/usr/lib$(LIBSUFFIX) ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libfontconfig.la \
+ )
+ @( cd $(FONTCFG_PKG)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" fontconfig.pc \
+ )
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(FONTCFG_PKG))
+ # ======= tune libtool *.la search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX) ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libfontconfig.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libfontconfig.la \
+ )
+ # ======= tune pkg-config *.pc search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(LIBSUFFIX)/pkgconfig ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" fontconfig.pc \
+ )
+ # ======= Strip binaries =======
+ @( cd $(FONTCFG_PKG) ; \
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+ )
+ifneq ($(CHRPATH),)
+ # ======= Set RPATH/RUNPATH for target binaries =======
+ @( cd $(FONTCFG_PKG)/usr/bin ; \
+ for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Set RPATH/RUNPATH for target shared objects =======
+ @( cd $(FONTCFG_PKG)/usr/lib$(LIBSUFFIX) ; \
+ for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+endif
+ @touch $@
+
+$(FONTCFG_PKG_DESCRIPTION_FILE): $(FONTCFG_PKG_DESCRIPTION_FILE_IN)
+ @cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature) : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(FONTCFG_PKG_DESCRIPTION_FILE) $(FONTCFG_PKG_INSTALL_SCRIPT)
+ @cp $(FONTCFG_PKG_DESCRIPTION_FILE) $(FONTCFG_PKG)/.DESCRIPTION
+ @cp $(FONTCFG_PKG_INSTALL_SCRIPT) $(FONTCFG_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(FONTCFG_PKG)/.REQUIRES
+ @echo "pkgname=$(FONTCFG_PKG_NAME)" > $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "pkgver=$(FONTCFG_PKG_VERSION)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "arch=$(FONTCFG_PKG_ARCH)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "distroname=$(FONTCFG_PKG_DISTRO_NAME)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "distrover=$(FONTCFG_PKG_DISTRO_VERSION)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "group=$(FONTCFG_PKG_GROUP)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(FONTCFG_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "url=$(FONTCFG_PKG_URL)" >> $(FONTCFG_PKG)/.PKGINFO ; \
+ echo "license=$(FONTCFG_PKG_LICENSE)" >> $(FONTCFG_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(FONTCFG_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.12.4/PATCHES
===================================================================
--- libs/fontconfig/2.12.4/PATCHES (nonexistent)
+++ libs/fontconfig/2.12.4/PATCHES (revision 671)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/x/fontconfig/patches/fontconfig-2.12.4.patch -p0
Index: libs/fontconfig/2.12.4/fontconfig-pkg-description.in
===================================================================
--- libs/fontconfig/2.12.4/fontconfig-pkg-description.in (nonexistent)
+++ libs/fontconfig/2.12.4/fontconfig-pkg-description.in (revision 671)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+fontconfig: fontconfig @VERSION@ (Font library and tools)
+fontconfig:
+fontconfig: Fontconfig is a library and tools designed to provide system-wide
+fontconfig: font configuration, customization, and application access.
+fontconfig:
+fontconfig: Fontconfig is written and maintained by Keith Packard.
+fontconfig:
+fontconfig:
+fontconfig:
+fontconfig:
+fontconfig:
Index: libs/fontconfig/2.12.4/fontconfig-pkg-install.sh
===================================================================
--- libs/fontconfig/2.12.4/fontconfig-pkg-install.sh (nonexistent)
+++ libs/fontconfig/2.12.4/fontconfig-pkg-install.sh (revision 671)
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# Preserve new files
+install_file() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+
+# arg 1: the new package version
+pre_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+post_install() {
+ # Notice we use an absolute path below, rather than usr/bin/fc-cache. This is because
+ # we're testing to see if we are on the bootdisk, which will not have /usr/bin/fc-cache.
+ # The presence of "/etc/system-installer" is under consideration as a better test.
+ # Also we have to check that we are not in the installer mode on the target system
+ # ("/etc/system-installer"), and we have to be sure that we are on the working system
+ # on the target hardware ("proc/sys/kernel/osrelease" - relative path).
+ if [ -r proc/sys/kernel/osrelease -a ! -r /etc/system-installer -a -x /usr/bin/fc-cache ]; then
+ /usr/bin/fc-cache -f
+ fi
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_update() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_update() {
+ post_install
+}
+
+# arg 1: the old package version
+pre_remove() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
Property changes on: libs/fontconfig/2.12.4/fontconfig-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: libs/fontconfig/2.12.4-x86_32/Makefile
===================================================================
--- libs/fontconfig/2.12.4-x86_32/Makefile (nonexistent)
+++ libs/fontconfig/2.12.4-x86_32/Makefile (revision 671)
@@ -0,0 +1,201 @@
+
+COMPONENT_TARGETS = $(HARDWARE_PC64)
+
+NEED_ABS_PATH = true
+COMPONENT_IS_3PP = true
+
+CREATE_X86_32_PACKAGE = true
+
+
+include ../../../../build-system/constants.mk
+
+
+SOURCE_REQUIRES = sources/packages/x/fontconfig
+
+REQUIRES = X11/libs/fontconfig/2.12.4
+REQUIRES += libs/expat/2.1.1-x86_32
+REQUIRES += env/freetype/2.6.3-x86_32
+
+# ======= __END_OF_REQUIRES__ =======
+
+
+version = 2.12.4
+tar_bz2_archive = $(SRC_PACKAGE_PATH)/packages/x/fontconfig/fontconfig-$(version).tar.bz2
+SRC_ARCHIVE = $(tar_bz2_archive)
+SRC_DIR = $(TARGET_BUILD_DIR)/fontconfig-$(version)
+src_dir_name = fontconfig-$(version)
+src_done = $(TARGET_BUILD_DIR)/.source_done
+
+PATCHES = PATCHES
+
+build_dir = $(TARGET_BUILD_DIR)/build
+build_target = $(TARGET_BUILD_DIR)/.build_done
+install_target = $(TARGET_BUILD_DIR)/.install_done
+
+
+####### Targets
+
+PKG_GROUP = xlibs
+
+#
+# *PKG_NAME & *PKG_VERSION shouldn't be a reference to value.
+#
+FONTCFG_32_PKG_NAME = fontconfig-x32
+FONTCFG_32_PKG_VERSION = 2.12.4
+FONTCFG_32_PKG_ARCH = $(TOOLCHAIN)
+FONTCFG_32_PKG_DISTRO_NAME = $(DISTRO_NAME)
+FONTCFG_32_PKG_DISTRO_VERSION = $(DISTRO_VERSION)
+FONTCFG_32_PKG_GROUP = $(PKG_GROUP)
+### |---handy-ruler-------------------------------|
+FONTCFG_32_PKG_SHORT_DESCRIPTION = Font library and tools
+FONTCFG_32_PKG_URL = $(BUG_URL)
+FONTCFG_32_PKG_LICENSE = custom
+FONTCFG_32_PKG_DESCRIPTION_FILE = $(TARGET_BUILD_DIR)/$(FONTCFG_32_PKG_NAME)-pkg-description
+FONTCFG_32_PKG_DESCRIPTION_FILE_IN = $(FONTCFG_32_PKG_NAME)-pkg-description.in
+FONTCFG_32_PKG_INSTALL_SCRIPT = $(FONTCFG_32_PKG_NAME)-pkg-install.sh
+
+FONTCFG_32_PKG = $(CURDIR)/$(TARGET_BUILD_DIR)/$(FONTCFG_32_PKG_NAME)-package
+
+pkg_basename = $(FONTCFG_32_PKG_NAME)-$(FONTCFG_32_PKG_VERSION)-$(FONTCFG_32_PKG_ARCH)-$(FONTCFG_32_PKG_DISTRO_NAME)-$(FONTCFG_32_PKG_DISTRO_VERSION)
+
+pkg_archive = $(TARGET_BUILD_DIR)/$(PKG_GROUP)/$(pkg_basename).$(pkg_arch_suffix)
+pkg_signature = $(call sign-name,$(pkg_archive))
+pkg_description = $(call desc-name,$(pkg_archive))
+products = $(call pkg-files,$(pkg_archive))
+
+BUILD_TARGETS = $(build_target)
+BUILD_TARGETS += $(install_target)
+
+PRODUCT_TARGETS = $(products)
+
+ROOTFS_TARGETS = $(pkg_archive)
+
+
+include ../../../../build-system/core.mk
+
+
+env_sysroot = DESTDIR=$(FONTCFG_32_PKG)
+
+
+extra_configure_switches = --libdir=/usr/lib$(MULTILIB_X86_32_SUFFIX)
+extra_configure_switches += --docdir=/usr/share/doc/$(src_dir_name)
+extra_configure_switches += --infodir=/usr/share/info
+extra_configure_switches += --mandir=/usr/share/man
+
+extra_configure_switches += --bindir=/usr/bin/32
+
+extra_configure_switches += --disable-dependency-tracking
+
+extra_configure_switches += --sysconfdir=/etc
+extra_configure_switches += --with-templatedir=/etc/fonts/conf.avai
+extra_configure_switches += --with-baseconfigdir=/etc/fonts
+extra_configure_switches += --with-configdir=/etc/fonts/conf.d
+extra_configure_switches += --with-xmldir=/etc/fonts
+extra_configure_switches += --localstatedir=/var
+
+extra_configure_switches += --enable-static=yes
+extra_configure_switches += --enable-shared=yes
+
+
+TARGET_BIN_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX)
+TARGET_LIB_RPATH = /lib$(MULTILIB_X86_32_SUFFIX):/usr/lib$(MULTILIB_X86_32_SUFFIX):/usr/lib/../lib$(MULTILIB_X86_32_SUFFIX)
+
+
+####### Dependencies
+
+$(src_done): $(SRC_ARCHIVE) $(PATCHES_DEP)
+ $(UNPACK_SRC_ARCHIVE)
+ $(APPLY_PATCHES)
+ @( cd $(SRC_DIR) ; \
+ rm -f src/fcobjshash.gperf src/fcobjshash.h ; \
+ )
+ @touch $@
+
+$(build_target): $(src_done)
+ @mkdir -p $(build_dir)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) ../$(src_dir_name)/configure \
+ --prefix=/usr \
+ --build=$(BUILD) \
+ --host=$(TARGET32) \
+ $(extra_configure_switches)
+ # ======= trick the Makefile.am developers =======
+ @( cd $(build_dir)/doc ; \
+ gcc -c -o edit-sgml.o $(CURDIR)/$(SRC_DIR)/doc/edit-sgml.c ; \
+ gcc -o edit-sgml edit-sgml.o ; \
+ )
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE)
+ @touch $@
+
+$(install_target): $(build_target)
+ @mkdir -p $(FONTCFG_32_PKG)
+ @cd $(build_dir) && $(BUILD_ENVIRONMENT) $(MAKE) -j1 install $(env_sysroot)
+ @rm -rf $(FONTCFG_32_PKG)/etc
+ @rm -rf $(FONTCFG_32_PKG)/usr/include
+ @rm -rf $(FONTCFG_32_PKG)/usr/share
+ @rm -rf $(FONTCFG_32_PKG)/var
+ # ======= remove toolchain path from target libtool *.la files =======
+ @( cd $(FONTCFG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" libfontconfig.la \
+ )
+ @( cd $(FONTCFG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+ sed -i "s,$(TARGET_DEST_DIR),,g" fontconfig.pc \
+ )
+ # ======= Install the same to $(TARGET_DEST_DIR) =======
+ $(call install-into-devenv, $(FONTCFG_32_PKG))
+ # ======= tune libtool *.la search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" libfontconfig.la ; \
+ sed -i "s,L/lib,L$(TARGET_DEST_DIR)/lib,g" libfontconfig.la \
+ )
+ # ======= tune pkg-config *.pc search path to the target destination for development =======
+ @( cd $(TARGET_DEST_DIR)/usr/lib$(MULTILIB_X86_32_SUFFIX)/pkgconfig ; \
+ sed -i "s,/usr,$(TARGET_DEST_DIR)/usr,g" fontconfig.pc \
+ )
+ # ======= Strip binaries =======
+ @( cd $(FONTCFG_32_PKG) ; \
+ find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs $(STRIP) --strip-unneeded 2> /dev/null ; \
+ find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs $(STRIP) -g 2> /dev/null \
+ )
+ifneq ($(CHRPATH),)
+ # ======= Set RPATH/RUNPATH for target binaries =======
+ @( cd $(FONTCFG_32_PKG)/usr/bin/32 ; \
+ for file in `find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(CHRPATH) -r $(TARGET_BIN_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+ # ======= Set RPATH/RUNPATH for target shared objects =======
+ @( cd $(FONTCFG_32_PKG)/usr/lib$(MULTILIB_X86_32_SUFFIX) ; \
+ for file in `find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs echo` ; do \
+ rpath=`$(CHRPATH) -l $$file 2> /dev/null | grep "R*PATH"` ; \
+ if echo "$$rpath" | grep -q "$(TARGET_DEST_DIR)" ; then \
+ $(CHRPATH) -r $(TARGET_LIB_RPATH) $$file 1> /dev/null 2> /dev/null ; \
+ fi ; \
+ done ; \
+ )
+endif
+ @touch $@
+
+$(FONTCFG_32_PKG_DESCRIPTION_FILE): $(FONTCFG_32_PKG_DESCRIPTION_FILE_IN)
+ @cat $< | $(SED) -e "s/@VERSION@/$(version)/g" > $@
+
+$(pkg_signature) : $(pkg_archive) ;
+$(pkg_description) : $(pkg_archive) ;
+
+$(pkg_archive): $(install_target) $(FONTCFG_32_PKG_DESCRIPTION_FILE) $(FONTCFG_32_PKG_INSTALL_SCRIPT)
+ @cp $(FONTCFG_32_PKG_DESCRIPTION_FILE) $(FONTCFG_32_PKG)/.DESCRIPTION
+ @cp $(FONTCFG_32_PKG_INSTALL_SCRIPT) $(FONTCFG_32_PKG)/.INSTALL
+ @$(BUILD_PKG_REQUIRES) $(FONTCFG_32_PKG)/.REQUIRES
+ @echo "pkgname=$(FONTCFG_32_PKG_NAME)" > $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "pkgver=$(FONTCFG_32_PKG_VERSION)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "arch=$(FONTCFG_32_PKG_ARCH)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "distroname=$(FONTCFG_32_PKG_DISTRO_NAME)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "distrover=$(FONTCFG_32_PKG_DISTRO_VERSION)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "group=$(FONTCFG_32_PKG_GROUP)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "short_description=\"$(FONTCFG_32_PKG_SHORT_DESCRIPTION)\"" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "url=$(FONTCFG_32_PKG_URL)" >> $(FONTCFG_32_PKG)/.PKGINFO ; \
+ echo "license=$(FONTCFG_32_PKG_LICENSE)" >> $(FONTCFG_32_PKG)/.PKGINFO
+ @$(PSEUDO) sh -c "cd $(FONTCFG_32_PKG) && chown -R root:root . && $(MAKE_PACKAGE) --linkadd yes .."
Index: libs/fontconfig/2.12.4-x86_32/PATCHES
===================================================================
--- libs/fontconfig/2.12.4-x86_32/PATCHES (nonexistent)
+++ libs/fontconfig/2.12.4-x86_32/PATCHES (revision 671)
@@ -0,0 +1,2 @@
+
+../../../../sources/packages/x/fontconfig/patches/fontconfig-2.12.4.patch -p0
Index: libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-description.in
===================================================================
--- libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-description.in (nonexistent)
+++ libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-description.in (revision 671)
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+fontconfig-x32: fontconfig-x32 @VERSION@ (x86_32 Font library and tools)
+fontconfig-x32:
+fontconfig-x32: Fontconfig is a library and tools designed to provide system-wide
+fontconfig-x32: font configuration, customization, and application access.
+fontconfig-x32:
+fontconfig-x32: Fontconfig is written and maintained by Keith Packard.
+fontconfig-x32:
+fontconfig-x32:
+fontconfig-x32:
+fontconfig-x32:
+fontconfig-x32:
Index: libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-install.sh
===================================================================
--- libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-install.sh (nonexistent)
+++ libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-install.sh (revision 671)
@@ -0,0 +1,39 @@
+#!/bin/sh
+
+# arg 1: the new package version
+pre_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+post_install() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+pre_update() {
+ /bin/true
+}
+
+# arg 1: the new package version
+# arg 2: the old package version
+post_update() {
+ post_install
+}
+
+# arg 1: the old package version
+pre_remove() {
+ /bin/true
+}
+
+# arg 1: the old package version
+post_remove() {
+ /bin/true
+}
+
+
+operation=$1
+shift
+
+$operation $*
Property changes on: libs/fontconfig/2.12.4-x86_32/fontconfig-x32-pkg-install.sh
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: libs/harfbuzz/1.2.7/Makefile
===================================================================
--- libs/harfbuzz/1.2.7/Makefile (revision 670)
+++ libs/harfbuzz/1.2.7/Makefile (revision 671)
@@ -31,7 +31,7 @@
SOURCE_REQUIRES = sources/packages/l/harfbuzz
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += libs/glib2/2.48.0
REQUIRES += libs/libpng/libpng14/1.4.19
Index: libs/libdrm/2.4.58/Makefile
===================================================================
--- libs/libdrm/2.4.58/Makefile (revision 670)
+++ libs/libdrm/2.4.58/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/packages/x/libdrm
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
Index: libs/libdrm/2.4.64/Makefile
===================================================================
--- libs/libdrm/2.4.64/Makefile (revision 670)
+++ libs/libdrm/2.4.64/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/packages/x/libdrm
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
Index: libs/libdrm/2.4.68/Makefile
===================================================================
--- libs/libdrm/2.4.68/Makefile (revision 670)
+++ libs/libdrm/2.4.68/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/packages/x/libdrm
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
ifneq ($(filter $(HARDWARE),$(HARDWARE_PC64) $(HARDWARE_PC32)),)
Index: libs/libvdpau/1.1.1/Makefile
===================================================================
--- libs/libvdpau/1.1.1/Makefile (revision 670)
+++ libs/libvdpau/1.1.1/Makefile (revision 671)
@@ -31,7 +31,7 @@
SOURCE_REQUIRES = sources/packages/m/libvdpau
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += X11/X.org/lib/libXext/1.3.3
Index: libs/mesa/11.2.2/Makefile
===================================================================
--- libs/mesa/11.2.2/Makefile (revision 670)
+++ libs/mesa/11.2.2/Makefile (revision 671)
@@ -31,7 +31,7 @@
SOURCE_REQUIRES = sources/packages/x/mesa/11.x
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += libs/expat/2.1.1
REQUIRES += libs/libxml2/2.9.3
Index: libs/mtdev/1.1.5/Makefile
===================================================================
--- libs/mtdev/1.1.5/Makefile (revision 670)
+++ libs/mtdev/1.1.5/Makefile (revision 671)
@@ -31,12 +31,12 @@
SOURCE_REQUIRES = sources/packages/x/mtdev
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
else
ifneq ($(HARDWARE),$(HARDWARE_PC64))
-REQUIRES = libs/glibc/2.24
+REQUIRES = libs/glibc/2.25
else
-REQUIRES = libs/glibc/2.24-x86_32
+REQUIRES = libs/glibc/2.25-x86_32
endif
endif
Index: libs/qt4/4.8.6/Makefile
===================================================================
--- libs/qt4/4.8.6/Makefile (revision 670)
+++ libs/qt4/4.8.6/Makefile (revision 671)
@@ -38,7 +38,7 @@
REQUIRES += libs/icu4c/55.1
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.13
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
Index: libs/qt4/4.8.6-x86_32/Makefile
===================================================================
--- libs/qt4/4.8.6-x86_32/Makefile (revision 670)
+++ libs/qt4/4.8.6-x86_32/Makefile (revision 671)
@@ -21,7 +21,7 @@
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.13-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt4/4.8.7/Makefile
===================================================================
--- libs/qt4/4.8.7/Makefile (revision 670)
+++ libs/qt4/4.8.7/Makefile (revision 671)
@@ -31,7 +31,7 @@
SOURCE_REQUIRES = sources/packages/x/qt4
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += net/ca-certificates/52.0
REQUIRES += X11/app/desktop-file-utils/0.22
@@ -46,7 +46,7 @@
REQUIRES += libs/icu4c/55.1
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.13
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
Index: libs/qt4/4.8.7/PATCHES
===================================================================
--- libs/qt4/4.8.7/PATCHES (revision 670)
+++ libs/qt4/4.8.7/PATCHES (revision 671)
@@ -3,7 +3,12 @@
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-cups.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-disable-sslv3.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-event-loop.patch -p0
-../../../../sources/packages/x/qt4/patches/qt4-4.8.7-moc-boost.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-22829.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-35459.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-version-check.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-alsa-1.1.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-gcc-version.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-qtreeview.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-mysql.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-settings.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-systemtrayicon.patch -p0
Index: libs/qt4/4.8.7/PATCHES.omap543x
===================================================================
--- libs/qt4/4.8.7/PATCHES.omap543x (revision 670)
+++ libs/qt4/4.8.7/PATCHES.omap543x (revision 671)
@@ -3,7 +3,12 @@
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-cups.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-disable-sslv3.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-event-loop.patch -p0
-../../../../sources/packages/x/qt4/patches/qt4-4.8.7-moc-boost.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-22829.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-35459.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-version-check.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-alsa-1.1.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-gcc-version.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-qtreeview.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-mysql.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-settings.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-systemtrayicon.patch -p0
Index: libs/qt4/4.8.7-x86_32/Makefile
===================================================================
--- libs/qt4/4.8.7-x86_32/Makefile (revision 670)
+++ libs/qt4/4.8.7-x86_32/Makefile (revision 671)
@@ -22,7 +22,7 @@
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.13-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt4/4.8.7-x86_32/PATCHES
===================================================================
--- libs/qt4/4.8.7-x86_32/PATCHES (revision 670)
+++ libs/qt4/4.8.7-x86_32/PATCHES (revision 671)
@@ -3,7 +3,12 @@
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-cups.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-disable-sslv3.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-event-loop.patch -p0
-../../../../sources/packages/x/qt4/patches/qt4-4.8.7-moc-boost.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-22829.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-QTBUG-35459.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-version-check.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-alsa-1.1.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-gcc-version.patch -p0
+../../../../sources/packages/x/qt4/patches/qt4-4.8.7-qtreeview.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-mysql.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-settings.patch -p0
../../../../sources/packages/x/qt4/patches/qt4-4.8.7-systemtrayicon.patch -p0
Index: libs/qt5/5.4.0/Makefile
===================================================================
--- libs/qt5/5.4.0/Makefile (revision 670)
+++ libs/qt5/5.4.0/Makefile (revision 671)
@@ -38,7 +38,7 @@
REQUIRES += libs/icu4c/55.1
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.12
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
Index: libs/qt5/5.4.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.4.0-x86_32/Makefile
===================================================================
--- libs/qt5/5.4.0-x86_32/Makefile (revision 670)
+++ libs/qt5/5.4.0-x86_32/Makefile (revision 671)
@@ -21,7 +21,7 @@
REQUIRES += libs/icu4c/55.1-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.12-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt5/5.4.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.4.2/Makefile
===================================================================
--- libs/qt5/5.4.2/Makefile (revision 670)
+++ libs/qt5/5.4.2/Makefile (revision 671)
@@ -51,7 +51,7 @@
REQUIRES += libs/assimp/3.2
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.13
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
Index: libs/qt5/5.4.2/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.2/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.4.2/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.2/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.4.2-x86_32/Makefile
===================================================================
--- libs/qt5/5.4.2-x86_32/Makefile (revision 670)
+++ libs/qt5/5.4.2-x86_32/Makefile (revision 671)
@@ -24,7 +24,7 @@
REQUIRES += libs/assimp/3.2-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.13-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt5/5.4.2-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.2-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.4.2-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.4.2-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.4.2-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.0/Makefile
===================================================================
--- libs/qt5/5.7.0/Makefile (revision 670)
+++ libs/qt5/5.7.0/Makefile (revision 671)
@@ -46,7 +46,7 @@
REQUIRES += libs/assimp/3.2
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.13
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
Index: libs/qt5/5.7.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.0/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.0/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.0/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.0-x86_32/Makefile
===================================================================
--- libs/qt5/5.7.0-x86_32/Makefile (revision 670)
+++ libs/qt5/5.7.0-x86_32/Makefile (revision 671)
@@ -23,7 +23,7 @@
REQUIRES += libs/assimp/3.2-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.13-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt5/5.7.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.0-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.0-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.0-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.0-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.1/Makefile
===================================================================
--- libs/qt5/5.7.1/Makefile (revision 670)
+++ libs/qt5/5.7.1/Makefile (revision 671)
@@ -35,7 +35,7 @@
endif
ifeq ($(__USE_BUILT_GCC_LIBS__),yes)
-REQUIRES = dev/gcc/5.3.0
+REQUIRES = dev/gcc/5.4.0
endif
REQUIRES += net/ca-certificates/52.0
REQUIRES += X11/app/desktop-file-utils/0.22
@@ -52,7 +52,7 @@
REQUIRES += libs/assimp/3.2
REQUIRES += app/cups/2.1.3
-REQUIRES += X11/libs/fontconfig/2.11.95
+REQUIRES += X11/libs/fontconfig/2.12.4
REQUIRES += X11/X.org/lib/libXaw/1.0.13
REQUIRES += X11/X.org/lib/libXcursor/1.1.14
@@ -80,7 +80,7 @@
$(HARDWARE_ODROID_C2) \
$(HARDWARE_P212) $(HARDWARE_KHADAS_VIM) \
$(HARDWARE_Q201) $(HARDWARE_ENYBOX_X2)),)
-REQUIRES += libs/libunwind/1.2
+REQUIRES += libs/libunwind/1.2.1
endif
REQUIRES += X11/libs/opengl-collection
Index: libs/qt5/5.7.1/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.1/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.1/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.1/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.1/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.1/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.1-x86_32/Makefile
===================================================================
--- libs/qt5/5.7.1-x86_32/Makefile (revision 670)
+++ libs/qt5/5.7.1-x86_32/Makefile (revision 671)
@@ -24,7 +24,7 @@
REQUIRES += libs/assimp/3.2-x86_32
REQUIRES += app/cups/2.1.3-x86_32
-REQUIRES += X11/libs/fontconfig/2.11.95-x86_32
+REQUIRES += X11/libs/fontconfig/2.12.4-x86_32
REQUIRES += X11/X.org/lib/libXaw/1.0.13-x86_32
REQUIRES += X11/X.org/lib/libXcursor/1.1.14-x86_32
Index: libs/qt5/5.7.1-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.1-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.1-x86_32/mkspecs/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX
Index: libs/qt5/5.7.1-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in
===================================================================
--- libs/qt5/5.7.1-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 670)
+++ libs/qt5/5.7.1-x86_32/mkspecs-pkg/linux-i386-gnu-g++/qmake.conf.in (revision 671)
@@ -1,5 +1,5 @@
#
-# qmake configuration for building with i486-radix-linux-gnu-g++
+# qmake configuration for building with i686-radix-linux-gnu-g++
#
MAKEFILE_GENERATOR = UNIX