Rebase few broken patches

patches/openwrt/hack/0008-Disable-ABI-stuff-for-now.patch

-From 1c0c0455d405b0c90f178d6b33fddc062cb4725c Mon Sep 17 00:00:00 2001
+From 5af85a2af762c03ece85621a87666963ff11e9bf Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Wed, 23 Jan 2019 22:31:51 +0100
 Subject: [PATCH] Disable ABI stuff for now
@@ -9,7 +9,7 @@ Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
  1 file changed, 4 insertions(+), 6 deletions(-)
 
 diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index 1cb4da8e30..c50c222352 100644
+index 9ca4879bfa..5d6dddb43e 100644
 --- a/include/package-ipkg.mk
 +++ b/include/package-ipkg.mk
 @@ -93,9 +93,8 @@ _endef=endef
@@ -43,8 +43,8 @@ index 1cb4da8e30..c50c222352 100644
  Version: $(VERSION)
  $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
  )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
--)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1)))))
-+)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
+-)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), $(1) $(foreach provide,$(PROVIDES),$(provide)$$(call GetABISuffix,$(provide))))))
++)$$(call addfield,Provides,$$(call mergelist,$$(filter-out $(1),$(PROVIDES)))
  )$$(call addfield,Alternatives,$$(call mergelist,$(ALTERNATIVES))
  )$$(call addfield,Source,$(SOURCE)
  )$$(call addfield,SourceName,$(1)

patches/openwrt/wip/0001-gettext-full-Add-gettext_filter-and-gettext.patch

-From 24d67c1a9f605292470397a7f4c8b46a9af53118 Mon Sep 17 00:00:00 2001
+From 48eba56519aae2c86a5ae7e6ee531108ea7ef22f Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Fri, 23 Feb 2018 21:10:56 +0100
 Subject: [PATCH] gettext-full: Add gettext_filter and gettext
 
 Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
 ---
- package/libs/gettext-full/Makefile                 | 15 ++++++
- .../src/gettext-tools/gettext_filter.c             | 54 ++++++++++++++++++++++
+ package/libs/gettext-full/Makefile            | 15 ++++++
+ .../src/gettext-tools/gettext_filter.c        | 54 +++++++++++++++++++
  2 files changed, 69 insertions(+)
  create mode 100644 package/libs/gettext-full/src/gettext-tools/gettext_filter.c
 
 diff --git a/package/libs/gettext-full/Makefile b/package/libs/gettext-full/Makefile
-index db6aee7..3beb8fd 100644
+index 2e65571701..282044cb19 100644
 --- a/package/libs/gettext-full/Makefile
 +++ b/package/libs/gettext-full/Makefile
-@@ -36,6 +36,14 @@ define Package/libintl-full
-   URL:=http://www.gnu.org/software/gettext/
+@@ -37,6 +37,14 @@ define Package/libintl-full
+   ABI_VERSION:=8
  endef
  
 +define Package/gettext-tools
@@ -29,8 +29,8 @@ index db6aee7..3beb8fd 100644
  TARGET_CFLAGS += $(FPIC)
  ifneq ($(HOST_OS),Linux)
    TARGET_CFLAGS += -I$(STAGING_DIR_HOSTPKG)/include
-@@ -95,5 +103,12 @@ define Package/libintl-full/install
- 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so* $(1)/usr/lib/
+@@ -98,5 +106,12 @@ define Package/libintl-full/install
+ 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libintl.so.* $(1)/usr/lib/
  endef
  
 +define Package/gettext-tools/install
@@ -44,7 +44,7 @@ index db6aee7..3beb8fd 100644
 +$(eval $(call BuildPackage,gettext-tools))
 diff --git a/package/libs/gettext-full/src/gettext-tools/gettext_filter.c b/package/libs/gettext-full/src/gettext-tools/gettext_filter.c
 new file mode 100644
-index 0000000..ae71824
+index 0000000000..ae71824572
 --- /dev/null
 +++ b/package/libs/gettext-full/src/gettext-tools/gettext_filter.c
 @@ -0,0 +1,54 @@
@@ -103,5 +103,5 @@ index 0000000..ae71824
 +	return 0;
 +}
 -- 
-2.16.2
+2.20.1