From 9d558ab93a7d672f4fcf9c5c1bdd123005355b5d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Jan 2017 19:25:04 +0100 Subject: remove gettext-tiny, libintl is now included in uClibc-ng --- package/SDL_ttf/Makefile | 3 +- package/at-spi2-core/Makefile | 3 +- package/atk/Makefile | 2 -- package/avahi/Makefile | 4 +-- package/firefox/Makefile | 4 +-- package/gettext-tiny/Makefile | 38 ---------------------- package/gettext-tiny/patches/patch-Makefile | 49 ----------------------------- package/glib/Makefile | 6 ++-- package/krb5/Makefile | 4 +-- package/libsecret/Makefile | 3 +- package/libtorrent/Makefile | 3 +- package/mplayer/Makefile | 4 +-- package/orbit2/Makefile | 3 +- package/pcre/Makefile | 1 - package/qemu/Makefile | 3 +- package/samba/Makefile | 4 +-- 16 files changed, 25 insertions(+), 109 deletions(-) delete mode 100644 package/gettext-tiny/Makefile delete mode 100644 package/gettext-tiny/patches/patch-Makefile diff --git a/package/SDL_ttf/Makefile b/package/SDL_ttf/Makefile index 694760a58..187bbecfc 100644 --- a/package/SDL_ttf/Makefile +++ b/package/SDL_ttf/Makefile @@ -10,7 +10,8 @@ PKG_HASH:= 7d38704bcc7c34029c2dcb73b2d4857e8ad76341c6e0faed279eb9f743c66c6a PKG_DESCR:= truetype fonts for sdl applications PKG_SECTION:= libs/fonts PKG_DEPENDS:= libsdl libfreetype -PKG_BUILDDEP:= sdl freetype gettext-tiny +PKG_BUILDDEP:= sdl freetype +PKG_NEEDS:= intl PKG_URL:= http://www.libsdl.org/projects/SDL_ttf/ PKG_SITES:= http://www.libsdl.org/projects/SDL_ttf/release/ PKG_LIBNAME:= libsdl-ttf diff --git a/package/at-spi2-core/Makefile b/package/at-spi2-core/Makefile index e9ecb7ebf..c6db623bf 100644 --- a/package/at-spi2-core/Makefile +++ b/package/at-spi2-core/Makefile @@ -11,7 +11,8 @@ PKG_HASH:= bae426d13d4a1ae3a35c6dd444e7fdef2159fbc9170eb39b6ae3213a27042d92 PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst libSM intltool-host gettext-tiny +PKG_BUILDDEP:= glib libXtst libSM intltool-host +PKG_NEEDS:= intl PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-core/$(PKG_EXTRAVER)/) PKG_OPTS:= dev diff --git a/package/atk/Makefile b/package/atk/Makefile index 12cfcdf5d..d199dec57 100644 --- a/package/atk/Makefile +++ b/package/atk/Makefile @@ -16,8 +16,6 @@ PKG_SITES:= $(MASTER_SITE_GNOME:=atk/$(PKG_EXTRAVER)/) PKG_LIBNAME:= libatk PKG_OPTS:= dev -PKG_BUILDDEP_UCLIBC_NG:=gettext-tiny - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBATK,libatk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) diff --git a/package/avahi/Makefile b/package/avahi/Makefile index b066527af..c9449baea 100644 --- a/package/avahi/Makefile +++ b/package/avahi/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 PKG_DESCR:= multicast dns daemon and dns-sd server PKG_SECTION:= net/dns -PKG_BUILDDEP:= libdaemon expat gdbm glib gettext-tiny -PKG_NEEDS:= c++ +PKG_BUILDDEP:= libdaemon expat gdbm glib +PKG_NEEDS:= c++ intl PKG_URL:= http://avahi.org/ PKG_SITES:= https://github.com/lathiat/avahi/releases/download/v$(PKG_VERSION)/ PKG_LIBNAME:= libavahi diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 2bfb74a82..20d01a30e 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -15,9 +15,9 @@ PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf li PKG_DEPENDS+= harfbuzz mesa libvpx libbz2 ca-certificates libevent at-spi2-atk at-spi2-core PKG_BUILDDEP:= alsa-lib glib libgtk2 libgtk3 libIDL libX11 mesa libtiff gdk-pixbuf PKG_BUILDDEP+= nspr nss libjpeg-turbo libXt fontconfig sqlite atk libpng hicolor-icon-theme -PKG_BUILDDEP+= libvpx pango gettext-tiny bzip2 libevent bzip2-host python2-host yasm-host +PKG_BUILDDEP+= libvpx pango bzip2 libevent bzip2-host python2-host yasm-host PKG_BUILDDEP+= zip-host autoconf-old-host -PKG_NEEDS:= threads c++ +PKG_NEEDS:= threads c++ intl PKG_URL:= http://www.mozilla.org/ PKG_SITES:= http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(PKG_VERSION)/source/ diff --git a/package/gettext-tiny/Makefile b/package/gettext-tiny/Makefile deleted file mode 100644 index eb8b5da5d..000000000 --- a/package/gettext-tiny/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include $(ADK_TOPDIR)/rules.mk - -PKG_NAME:= gettext-tiny -PKG_VERSION:= 0.0.4 -PKG_RELEASE:= 1 -PKG_HASH:= fffb22ae01bc8f4772ba6fcfddce4a87f199589e0230cba26df65110007c7821 -PKG_DESCR:= gettext stub and replacement -PKG_SECTION:= libs/misc -PKG_BUILDDEP:= gettext-tiny-host -PKG_URL:= https://github.com/rofl0r/gettext-tiny -PKG_SITES:= http://ftp.barfooze.de/pub/sabotage/tarballs/ -PKG_OPTS:= dev - -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE})) -$(eval $(call PKG_template,GETTEXT_TINY,gettext-tiny,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -HOST_STYLE:= manual -CONFIG_STYLE:= manual - -host-build: - (cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ - ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET}) - -gettext-tiny-hostinstall: - ${CP} ${WRKBUILD}/include/libintl.h ${STAGING_HOST_DIR}/usr/include - ${CP} ${WRKBUILD}/libintl.a ${STAGING_HOST_DIR}/usr/lib - ${CP} ${WRKBUILD}/{msgfmt,xgettext,msgmerge} ${STAGING_HOST_DIR}/usr/bin - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/gettext-tiny/patches/patch-Makefile b/package/gettext-tiny/patches/patch-Makefile deleted file mode 100644 index dcc98f4bb..000000000 --- a/package/gettext-tiny/patches/patch-Makefile +++ /dev/null @@ -1,49 +0,0 @@ ---- gettext-tiny-0.0.4.orig/Makefile 2014-03-02 15:55:44.000000000 +0100 -+++ gettext-tiny-0.0.4/Makefile 2016-07-17 01:00:02.732966962 +0200 -@@ -1,4 +1,4 @@ --prefix=/usr/local -+prefix=/usr - bindir=$(prefix)/bin - includedir=$(prefix)/include - libdir=$(prefix)/lib -@@ -19,7 +19,8 @@ ALL_INCLUDES = $(HEADERS) - ALL_LIBS=libintl.a - ALL_TOOLS=msgfmt msgmerge xgettext - --CFLAGS=-O0 -fPIC -+CFLAGS?=-O0 -+CFLAGS+=-fPIC - - AR ?= $(CROSS_COMPILE)ar - RANLIB ?= $(CROSS_COMPILE)ranlib -@@ -47,22 +48,25 @@ libintl.a: $(LIBOBJS) - $(RANLIB) $@ - - msgmerge: $(OBJS) -- $(CC) $(LDFLAGS) -static -o $@ src/msgmerge.o $(PARSEROBJS) -+ $(CC) $(LDFLAGS) -o $@ src/msgmerge.o $(PARSEROBJS) - - msgfmt: $(OBJS) -- $(CC) $(LDFLAGS) -static -o $@ src/msgfmt.o $(PARSEROBJS) -+ $(CC) $(LDFLAGS) -o $@ src/msgfmt.o $(PARSEROBJS) - - xgettext: - cp src/xgettext.sh ./xgettext - - $(DESTDIR)$(libdir)/%.a: %.a -- install -D -m 755 $< $@ -+ mkdir -p $(DESTDIR)$(libdir) -+ install -m 755 $< $@ - - $(DESTDIR)$(includedir)/%.h: include/%.h -- install -D -m 644 $< $@ -+ mkdir -p $(DESTDIR)$(includedir) -+ install -m 644 $< $@ - - $(DESTDIR)$(bindir)/%: % -- install -D -m 755 $< $@ -+ mkdir -p $(DESTDIR)$(bindir) -+ install -m 755 $< $@ - - .PHONY: all clean install - diff --git a/package/glib/Makefile b/package/glib/Makefile index 7e07bac4c..026fe1a19 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -11,9 +11,9 @@ PKG_HASH:= f25e751589cb1a58826eac24fbd4186cda4518af772806b666a3f91f66e6d3f4 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc PKG_DEPENDS:= libpcre zlib -PKG_BUILDDEP:= glib-host libffi gettext-tiny zlib libelf dbus pcre -HOST_BUILDDEP:= libffi-host gettext-tiny-host python2-host -PKG_NEEDS:= threads +PKG_BUILDDEP:= glib-host libffi zlib libelf dbus pcre +HOST_BUILDDEP:= libffi-host python2-host +PKG_NEEDS:= threads intl PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ PKG_OPTS:= dev noscripts diff --git a/package/krb5/Makefile b/package/krb5/Makefile index 1353e36f8..b4c76198b 100644 --- a/package/krb5/Makefile +++ b/package/krb5/Makefile @@ -10,8 +10,8 @@ PKG_HASH:= 4df629fdf97f362cf81edbf38d613b32b492dd88c876cf3aa1c66562f296663e PKG_DESCR:= kerberos server PKG_SECTION:= app/crypto PKG_DEPENDS:= libkrb5 libncurses keyutils -PKG_BUILDDEP:= ncurses gettext-tiny bison-host -PKG_NEEDS:= threads +PKG_BUILDDEP:= ncurses bison-host +PKG_NEEDS:= threads intl PKG_URL:= http://web.mit.edu/kerberos/ PKG_SITES:= http://web.mit.edu/kerberos/dist/krb5/1.13/ PKG_LIBNAME:= libkrb5 diff --git a/package/libsecret/Makefile b/package/libsecret/Makefile index e9d0464e0..d7491ba50 100644 --- a/package/libsecret/Makefile +++ b/package/libsecret/Makefile @@ -10,7 +10,8 @@ PKG_HASH:= 0c73aa762dbd1e38ba7b03de350e23ce818cb810b0784375e95ef61e004b02e3 PKG_DESCR:= library for storing and retrieving passwords PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt glib -PKG_BUILDDEP:= intltool-host gettext-tiny libgcrypt glib +PKG_BUILDDEP:= intltool-host libgcrypt glib +PKG_NEEDS:= intl PKG_URL:= https://wiki.gnome.org/Libsecret PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/libsecret/${PKG_VERSION}/ PKG_OPTS:= dev diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 6035637e4..f631b37fd 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -10,7 +10,8 @@ PKG_HASH:= 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 PKG_DESCR:= bittorrent library PKG_SECTION:= libs/net PKG_DEPENDS:= libsigc++ zlib libressl -PKG_BUILDDEP:= libsigc++ zlib libressl gettext-tiny +PKG_BUILDDEP:= libsigc++ zlib libressl +PKG_NEEDS:= intl PKG_URL:= https://rakshasa.github.io/rtorrent/ PKG_SITES:= http://rtorrent.net/downloads/ PKG_OPTS:= dev diff --git a/package/mplayer/Makefile b/package/mplayer/Makefile index 23a9836b3..9d4354ed9 100644 --- a/package/mplayer/Makefile +++ b/package/mplayer/Makefile @@ -15,8 +15,8 @@ PKG_DEPENDS+= libx11 libxau libxdmcp libxext libxv zlib PKG_DEPENDS+= libxscrnsaver libtheora libxvid libvpx PKG_BUILDDEP:= alsa-lib libmad libvorbis faad2 ncurses zlib PKG_BUILDDEP+= libX11 libXv libpng libXext libjpeg-turbo libtheora -PKG_BUILDDEP+= xvidcore libvpx gettext-tiny -PKG_NEEDS:= threads +PKG_BUILDDEP+= xvidcore libvpx +PKG_NEEDS:= threads intl PKG_URL:= http://www.mplayerhq.hu/ PKG_SITES:= http://www.mplayerhq.hu/MPlayer/releases/ diff --git a/package/orbit2/Makefile b/package/orbit2/Makefile index 5e541a8bf..459fd537f 100644 --- a/package/orbit2/Makefile +++ b/package/orbit2/Makefile @@ -10,8 +10,9 @@ PKG_RELEASE:= 5 PKG_HASH:= 5724ed85c626ce406156d2f7c4d104d670eb82cf78e582c325e713a31632c9bd PKG_DESCR:= corba 2.4-compliant object request broker PKG_SECTION:= libs/misc -PKG_BUILDDEP:= gettext-tiny glib libIDL-host libIDL +PKG_BUILDDEP:= glib libIDL-host libIDL HOST_BULDDEP:= glib-host libIDL-host +PKG_NEEDS:= intl PKG_URL:= http://projects.gnome.org/ORBit2/ PKG_SITES:= ftp://ftp.gnome.org//pub/gnome/sources/ORBit2/${PKG_EXTRAVER}/ PKG_LIBNAME:= orbit2 diff --git a/package/pcre/Makefile b/package/pcre/Makefile index 54995240b..77a8cc322 100644 --- a/package/pcre/Makefile +++ b/package/pcre/Makefile @@ -9,7 +9,6 @@ PKG_RELEASE:= 1 PKG_HASH:= ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7 PKG_DESCR:= perl compatible regular expression library PKG_SECTION:= libs/misc -PKG_BUILDDEPS:= gettext-tiny PKG_URL:= http://www.pcre.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pcre/} PKG_LIBNAME:= libpcre diff --git a/package/qemu/Makefile b/package/qemu/Makefile index cf17a671d..abfb90f5f 100644 --- a/package/qemu/Makefile +++ b/package/qemu/Makefile @@ -10,8 +10,9 @@ PKG_HASH:= 3443887401619fe33bfa5d900a4f2d6a79425ae2b7e43d5b8c36eb7a683772d4 PKG_DESCR:= cpu and system emulator PKG_SECTION:= sys/misc PKG_DEPENDS:= zlib glib alsa-lib -PKG_BUILDDEP:= gettext-tiny alsa-lib zlib glib +PKG_BUILDDEP:= alsa-lib zlib glib HOST_BUILDDEP:= glib-host pkgconf-host +PKG_NEEDS:= intl PKG_URL:= http://wwww.qemu.org/ PKG_SITES:= http://wiki.qemu.org/download/ diff --git a/package/samba/Makefile b/package/samba/Makefile index 9662fda64..0358f9a2b 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -10,9 +10,9 @@ PKG_HASH:= f06dc454a1bb72b21a329e1ad75a14795886401671ec7439d69a6b824c492eca PKG_DESCR:= file and print server PKG_SECTION:= net/fs PKG_DEPENDS:= libuuid libpopt libgnutls libtirpc -PKG_BUILDDEP:= gettext-tiny util-linux popt python2 gnutls +PKG_BUILDDEP:= util-linux popt python2 gnutls PKG_BUILDDEP+= heimdal-host python2-host libtirpc -PKG_NEEDS:= threads +PKG_NEEDS:= threads intl PKG_URL:= http://www.samba.org/ PKG_SITES:= http://samba.org/samba/ftp/stable/ -- cgit v1.2.3