Hi Lars attach patch update xfce feeds packages to new NLS strategy.
Index: app/xfce4-appfinder/Makefile =================================================================== --- app/xfce4-appfinder/Makefile (revision 25464) +++ app/xfce4-appfinder/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce4-appfinder SECTION:=xorg-app Index: app/xfconf/Makefile =================================================================== --- app/xfconf/Makefile (revision 25464) +++ app/xfconf/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/libxfconf SECTION:=xorg-app Index: app/xfce-utils/Makefile =================================================================== --- app/xfce-utils/Makefile (revision 25464) +++ app/xfce-utils/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce-utils SECTION:=xorg-app Index: app/xfprint/Makefile =================================================================== --- app/xfprint/Makefile (revision 25464) +++ app/xfprint/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfprint SECTION:=xorg-app Index: app/xfce4-session/Makefile =================================================================== --- app/xfce4-session/Makefile (revision 25464) +++ app/xfce4-session/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce4-session SECTION:=xorg-app Index: app/xfce4-mixer/Makefile =================================================================== --- app/xfce4-mixer/Makefile (revision 25464) +++ app/xfce4-mixer/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce4-mixer SECTION:=xorg-app Index: app/xarchiver/Makefile =================================================================== --- app/xarchiver/Makefile (revision 25464) +++ app/xarchiver/Makefile (working copy) @@ -19,13 +19,12 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xarchiver SECTION:=xorg-app Index: app/orage/Makefile =================================================================== --- app/orage/Makefile (revision 25464) +++ app/orage/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/orage SECTION:=xorg-app Index: app/xfce-terminal/Makefile =================================================================== --- app/xfce-terminal/Makefile (revision 25464) +++ app/xfce-terminal/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce-terminal SECTION:=xorg-app Index: app/xfce-mousepad/Makefile =================================================================== --- app/xfce-mousepad/Makefile (revision 25464) +++ app/xfce-mousepad/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce-mousepad SECTION:=xorg-app Index: app/thunar/Makefile =================================================================== --- app/thunar/Makefile (revision 25464) +++ app/thunar/Makefile (working copy) @@ -20,13 +20,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/libthunar-vfs SECTION:=xorg-lib Index: app/xfburn/Makefile =================================================================== --- app/xfburn/Makefile (revision 25464) +++ app/xfburn/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfburn SECTION:=xorg-app Index: app/xfce4-panel/Makefile =================================================================== --- app/xfce4-panel/Makefile (revision 25464) +++ app/xfce4-panel/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib/ + -Wl,-rpath=/usr/lib define Package/libxfce4-panel SECTION:=xorg-lib Index: app/xfdesktop/Makefile =================================================================== --- app/xfdesktop/Makefile (revision 25464) +++ app/xfdesktop/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfdesktop SECTION:=xorg-app Index: app/xfce4-settings/Makefile =================================================================== --- app/xfce4-settings/Makefile (revision 25464) +++ app/xfce4-settings/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfce4-settings SECTION:=xorg-app Index: app/xfmedia/Makefile =================================================================== --- app/xfmedia/Makefile (revision 25464) +++ app/xfmedia/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfmedia SECTION:=xorg-app Index: wm/xfwm4/Makefile =================================================================== --- wm/xfwm4/Makefile (revision 25464) +++ wm/xfwm4/Makefile (working copy) @@ -19,14 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+= \ - -I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib + -Wl,-rpath=/usr/lib define Package/xfwm4 SECTION:=xorg-app Index: data/gtk-xfce-engine/Makefile =================================================================== --- data/gtk-xfce-engine/Makefile (revision 25464) +++ data/gtk-xfce-engine/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib \ + -Wl,-rpath=/usr/lib define Package/gtk-xfce-engine SECTION:=xorg-app Index: libs/libexo/Makefile =================================================================== --- libs/libexo/Makefile (revision 25464) +++ libs/libexo/Makefile (working copy) @@ -19,13 +19,11 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include/ - TARGET_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -Wl,-rpath=/usr/lib \ - -L$(STAGING_DIR)/usr/lib/libintl/lib/ + -Wl,-rpath=/usr/lib define Package/libexo SECTION:=xorg-framework Index: libs/libxfce4menu/Makefile =================================================================== --- libs/libxfce4menu/Makefile (revision 25464) +++ libs/libxfce4menu/Makefile (working copy) @@ -19,13 +19,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+= \ - -I$(STAGING_DIR)/usr/lib/libintl/include - -TARGET_LDFLAGS+= \ - -L$(STAGING_DIR)/usr/lib/libintl/lib - define Package/libxfce4menu SECTION:=xorg-framework CATEGORY:=Xorg Index: libs/libxfcegui4/Makefile =================================================================== --- libs/libxfcegui4/Makefile (revision 25464) +++ libs/libxfcegui4/Makefile (working copy) @@ -19,13 +19,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+= \ - -I$(STAGING_DIR)/usr/lib/libintl/include/ - -TARGET_CFLAGS+= \ - -L$(STAGING_DIR)/usr/lib/libintl/lib/ - define Package/libxfcegui4 SECTION:=xorg-framework CATEGORY:=Xorg Index: libs/libxfce4util/Makefile =================================================================== --- libs/libxfce4util/Makefile (revision 25464) +++ libs/libxfce4util/Makefile (working copy) @@ -19,9 +19,8 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk -TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include - define Package/libxfce4util SECTION:=xorg-framework CATEGORY:=Xorg
_______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
