From 2189574cbc4cc831c44a694e6334b6e3ca7c76ce Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 12:38:09 +0300 Subject: [PATCH 1/8] update to 5.15.6 add qtlocation --- libs/qt5/Makefile | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index 9960aac..3878d1b 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qt5 -PKG_VERSION:=5.12 +PKG_VERSION:=5.15 PKG_RELEASE:=6 -PKG_MD5SUM:=287d71e71ebd97f77220873e7b131b1a +PKG_MD5SUM:=eac9a97ea5335eeb1a8f0c39d016bf70 PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single @@ -105,6 +105,12 @@ define Package/qt5-test DEPENDS+=+qt5-core endef +define Package/qt5-location + $(call Package/qt5/Default) + TITLE+=location + DEPENDS+=+qt5-core +endef + define Build/Configure $(INSTALL_DIR) $(PKG_BUILD_DIR)/qtbase/lib/fonts $(INSTALL_DIR) $(PKG_BUILD_DIR)/qtbase/mkspecs/linux-openwrt-g++ @@ -278,6 +284,16 @@ define Package/qt5-test/install $(CP) $(PKG_BUILD_DIR)/qtbase/lib/libQt5Test.la $(1)/usr/lib/ endef +define Package/qt5-location/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.prl $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.la $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.so* $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.prl $(1)/usr/lib/ + $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.la $(1)/usr/lib/ +endef + $(eval $(call BuildPackage,qt5-core)) $(eval $(call BuildPackage,qt5-concurrent)) $(eval $(call BuildPackage,qt5-network)) @@ -288,3 +304,4 @@ $(eval $(call BuildPackage,qt5-serialport)) $(eval $(call BuildPackage,qt5-serialbus)) $(eval $(call BuildPackage,qt5-xmlpatterns)) $(eval $(call BuildPackage,qt5-test)) +$(eval $(call BuildPackage,qt5-location)) From a634b8939adcf6be5ba18e7042213ed1a6385287 Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 12:39:31 +0300 Subject: [PATCH 2/8] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index df8c5e1..474fb1b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # qt5-openwrt -QT 5.12.6 for Openwrt 19.07 with modbus & serialport +QT 5.15.6 for Openwrt 19.07 with modbus & serialport & location ========================= Installation instructions @@ -9,7 +9,7 @@ Installation instructions ``` -src-git libqt https://github.com/Lankaster/qt5-openwrt.git +src-git libqt https://github.com/karaketir16/qt5-openwrt.git ``` 2. Update & install feeds From e5025cdb11df529fad34a8bcbcce67b5a144a55e Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 12:58:39 +0300 Subject: [PATCH 3/8] url change --- libs/qt5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index 3878d1b..cfa103a 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -15,7 +15,7 @@ PKG_RELEASE:=6 PKG_MD5SUM:=eac9a97ea5335eeb1a8f0c39d016bf70 PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz -PKG_SOURCE_URL:=http://download.qt-project.org/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single +PKG_SOURCE_URL:=https://download.qt.io/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 From aca67ebd9f2a0b8d9a012c02bd22f2309d75f8cd Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 13:00:06 +0300 Subject: [PATCH 4/8] fix url --- libs/qt5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index cfa103a..bb4ce51 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -16,7 +16,7 @@ PKG_MD5SUM:=eac9a97ea5335eeb1a8f0c39d016bf70 PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=https://download.qt.io/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE) +PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 PKG_BUILD_DEPENDS:=libiconv From 9a6d73c4f49b4a36992060b28fdec15c99d259fb Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 13:02:06 +0300 Subject: [PATCH 5/8] fix --- libs/qt5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index bb4ce51..d761788 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -14,7 +14,7 @@ PKG_VERSION:=5.15 PKG_RELEASE:=6 PKG_MD5SUM:=eac9a97ea5335eeb1a8f0c39d016bf70 -PKG_SOURCE:=qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz +PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=https://download.qt.io/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_PARALLEL:=1 From 2c6a365801ad02995d652611bc6fe8d242c89212 Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 14:15:33 +0300 Subject: [PATCH 6/8] try to fix --- libs/qt5/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index d761788..ab1115a 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -16,7 +16,7 @@ PKG_MD5SUM:=eac9a97ea5335eeb1a8f0c39d016bf70 PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE).tar.xz PKG_SOURCE_URL:=https://download.qt.io/archive/qt/$(PKG_VERSION)/$(PKG_VERSION).$(PKG_RELEASE)/single -PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION).$(PKG_RELEASE) +PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-src-$(PKG_VERSION).$(PKG_RELEASE) PKG_BUILD_PARALLEL:=1 PKG_USE_MIPS16:=0 PKG_BUILD_DEPENDS:=libiconv From 71e04971d778142bfc6b7f529d675214fa02c172 Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Tue, 11 Oct 2022 14:49:41 +0300 Subject: [PATCH 7/8] remove libQt5Location --- libs/qt5/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/qt5/Makefile b/libs/qt5/Makefile index ab1115a..05accc2 100644 --- a/libs/qt5/Makefile +++ b/libs/qt5/Makefile @@ -286,9 +286,6 @@ endef define Package/qt5-location/install $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.so* $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.prl $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Location.la $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.prl $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/qtlocation/lib/libQt5Positioning.la $(1)/usr/lib/ From d7e6a702c4b13cb14fe59d6988ad32b362f25587 Mon Sep 17 00:00:00 2001 From: Osman Karaketir Date: Wed, 9 Nov 2022 13:56:42 +0300 Subject: [PATCH 8/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 474fb1b..c503c49 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ Installation instructions ``` -src-git libqt https://github.com/karaketir16/qt5-openwrt.git +src-git libqt https://github.com/Lankaster/qt5-openwrt.git ``` 2. Update & install feeds