From a60a17cd488cbe017b95f52bcb0f881d7a4a5846 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 29 Dec 2015 20:29:32 +0100 Subject: xorg: update all packages to latest stable version, remove mirror.mk entry --- package/libX11/Makefile | 6 ++-- package/libX11/patches/patch-ltmain_sh | 11 ------ package/libX11/patches/patch-src_util_Makefile_in | 44 ----------------------- 3 files changed, 3 insertions(+), 58 deletions(-) delete mode 100644 package/libX11/patches/patch-ltmain_sh delete mode 100644 package/libX11/patches/patch-src_util_Makefile_in (limited to 'package/libX11') diff --git a/package/libX11/Makefile b/package/libX11/Makefile index 634fbd175..26a172f7c 100644 --- a/package/libX11/Makefile +++ b/package/libX11/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libX11 -PKG_VERSION:= 1.6.2 +PKG_VERSION:= 1.6.3 PKG_RELEASE:= 1 -PKG_HASH:= b93739bcd517723121f508bcaf0c213c1bae9c5eacffdca571ff0d86c30ead3e +PKG_HASH:= 0b03b9d22f4c9e59b4ba498f294e297f013cae27050dfa0f3496640200db5376 PKG_DESCR:= x11 client-side library PKG_SECTION:= x11/libs PKG_BUILDDEP:= libX11-host xproto xextproto xtrans libXdmcp libXau xcb-proto @@ -14,7 +14,7 @@ PKG_BUILDDEP+= xcmiscproto bigreqsproto kbproto inputproto libxcb HOST_BUILDDEP:= xproto-host xextproto-host kbproto-host libpthread-stubs-host HOST_BUILDDEP+= inputproto-host libXau-host xcb-proto-host libxcb-host xtrans-host PKG_DEPENDS:= libxdmcp libxcb libxau -PKG_SITES:= ${MASTER_SITE_XORG} +PKG_SITES:= http://www.x.org/releases/individual/lib/ PKG_LIBNAME:= libx11 PKG_OPTS:= dev diff --git a/package/libX11/patches/patch-ltmain_sh b/package/libX11/patches/patch-ltmain_sh deleted file mode 100644 index 28e1f1cc1..000000000 --- a/package/libX11/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- libX11-1.5.0.orig/ltmain.sh 2012-06-02 08:37:28.000000000 +0200 -+++ libX11-1.5.0/ltmain.sh 2013-04-29 17:55:12.000000000 +0200 -@@ -5853,7 +5853,7 @@ func_mode_link () - # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ - -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -- -O*|-flto*|-fwhopr*|-fuse-linker-plugin) -+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" diff --git a/package/libX11/patches/patch-src_util_Makefile_in b/package/libX11/patches/patch-src_util_Makefile_in deleted file mode 100644 index a65437985..000000000 --- a/package/libX11/patches/patch-src_util_Makefile_in +++ /dev/null @@ -1,44 +0,0 @@ ---- libX11-1.5.0.orig/src/util/Makefile.in 2012-06-02 08:37:33.000000000 +0200 -+++ libX11-1.5.0/src/util/Makefile.in 2013-10-04 09:47:19.000000000 +0200 -@@ -144,7 +144,7 @@ LD = @LD@ - LDFLAGS = @LDFLAGS_FOR_BUILD@ - LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@ - LIBOBJS = @LIBOBJS@ --LIBS = @LIBS@ -+LIBS = - LIBTOOL = @LIBTOOL@ - LIB_MAN_DIR = @LIB_MAN_DIR@ - LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@ -@@ -265,9 +265,6 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --makekeys_CFLAGS = \ -- $(X11_CFLAGS) \ -- $(CWARNFLAGS) - - makekeys_CPPFLAGS = \ - -I$(top_srcdir)/include -@@ -355,18 +352,18 @@ distclean-compile: - @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< - - makekeys-makekeys.o: makekeys.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.o -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='makekeys.c' object='makekeys-makekeys.o' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.o `test -f 'makekeys.c' || echo '$(srcdir)/'`makekeys.c - - makekeys-makekeys.obj: makekeys.c --@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` -+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -MT makekeys-makekeys.obj -MD -MP -MF $(DEPDIR)/makekeys-makekeys.Tpo -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` - @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/makekeys-makekeys.Tpo $(DEPDIR)/makekeys-makekeys.Po - @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='makekeys.c' object='makekeys-makekeys.obj' libtool=no @AMDEPBACKSLASH@ - @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ --@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` -+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(makekeys_CPPFLAGS) $(CPPFLAGS) $(makekeys_CFLAGS) $(CFLAGS_FOR_BUILD) -c -o makekeys-makekeys.obj `if test -f 'makekeys.c'; then $(CYGPATH_W) 'makekeys.c'; else $(CYGPATH_W) '$(srcdir)/makekeys.c'; fi` - - mostlyclean-libtool: - -rm -f *.lo -- cgit v1.2.3