diff -pruN 0.11.0-2/CHANGELOG 0.12.0-0ubuntu3/CHANGELOG --- 0.11.0-2/CHANGELOG 2022-04-16 00:48:16.000000000 +0000 +++ 0.12.0-0ubuntu3/CHANGELOG 2022-11-05 07:55:11.000000000 +0000 @@ -1,9 +1,15 @@ +lxqt-build-tools-0.12.0 / 2022-11-05 +==================================== + * Support absolute `CMAKE_INSTALL_{INCLUDE,LIB}DIR` in `LXQtCreatePkgConfigFile`. + * Use `gdesktopappinfo.h` to find gio-unix-2.0 in `FindGLIB.cmake`. + * Drop use of `-Bsymbolic` in `LXQtCompilerSettings`. + lxqt-build-tools-0.11.0 / 2022-04-15 -=================================== +==================================== * Replaced `gunixconnection.h` file in `gio-unix` include dir check (after GLib 2.71.1). lxqt-build-tools-0.10.0 / 2021-11-04 -=================================== +==================================== * Set the minimum required version of Qt to 5.15. lxqt-build-tools-0.9.0 / 2021-04-15 diff -pruN 0.11.0-2/cmake/find-modules/FindGLIB.cmake 0.12.0-0ubuntu3/cmake/find-modules/FindGLIB.cmake --- 0.11.0-2/cmake/find-modules/FindGLIB.cmake 2022-04-16 00:48:16.000000000 +0000 +++ 0.12.0-0ubuntu3/cmake/find-modules/FindGLIB.cmake 2022-11-05 07:55:11.000000000 +0000 @@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONEN elseif (${_component} STREQUAL "gio-unix") pkg_check_modules(GIO_UNIX gio-unix-2.0) find_path(GLIB_GIO_UNIX_INCLUDE_DIR - NAMES gio/gunixfdlist.h + NAMES gio/gdesktopappinfo.h HINTS ${GIO_UNIX_INCLUDEDIR} PATH_SUFFIXES gio-unix-2.0) diff -pruN 0.11.0-2/cmake/modules/LXQtCompilerSettings.cmake 0.12.0-0ubuntu3/cmake/modules/LXQtCompilerSettings.cmake --- 0.11.0-2/cmake/modules/LXQtCompilerSettings.cmake 2022-04-16 00:48:16.000000000 +0000 +++ 0.12.0-0ubuntu3/cmake/modules/LXQtCompilerSettings.cmake 2022-11-05 07:55:11.000000000 +0000 @@ -164,7 +164,7 @@ if (CMAKE_COMPILER_IS_GNUCXX OR LXQT_COM set(NO_UNDEFINED_FLAGS "-Wl,--no-undefined") # -Bsymbolic-functions: replace dynamic symbols used internally in # shared libs with direct addresses. - set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions -Wl,-Bsymbolic") + set(SYMBOLIC_FLAGS "-Wl,-Bsymbolic-functions") endif() set(CMAKE_SHARED_LINKER_FLAGS diff -pruN 0.11.0-2/cmake/modules/LXQtCreatePkgConfigFile.cmake 0.12.0-0ubuntu3/cmake/modules/LXQtCreatePkgConfigFile.cmake --- 0.11.0-2/cmake/modules/LXQtCreatePkgConfigFile.cmake 2022-04-16 00:48:16.000000000 +0000 +++ 0.12.0-0ubuntu3/cmake/modules/LXQtCreatePkgConfigFile.cmake 2022-11-05 07:55:11.000000000 +0000 @@ -104,11 +104,19 @@ function(lxqt_create_pkgconfig_file) endif() if (NOT DEFINED USER_INCLUDEDIR_PREFIX) - set(_PKGCONFIG_INCLUDEDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}") + set(_PKGCONFIG_INCLUDEDIR_PREFIX "${CMAKE_INSTALL_INCLUDEDIR}") + else() + set(_PKGCONFIG_INCLUDEDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") + endif() endif() if (NOT DEFINED USER_LIBDIR_PREFIX) - set(_PKGCONFIG_LIBDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}") + set(_PKGCONFIG_LIBDIR_PREFIX "${CMAKE_INSTALL_LIBDIR}") + else() + set(_PKGCONFIG_LIBDIR_PREFIX "\${prefix}/${CMAKE_INSTALL_LIBDIR}") + endif() endif() if (NOT DEFINED USER_DESCRIPTIVE_NAME) diff -pruN 0.11.0-2/CMakeLists.txt 0.12.0-0ubuntu3/CMakeLists.txt --- 0.11.0-2/CMakeLists.txt 2022-04-16 00:48:16.000000000 +0000 +++ 0.12.0-0ubuntu3/CMakeLists.txt 2022-11-05 07:55:11.000000000 +0000 @@ -9,7 +9,7 @@ project(lxqt-build-tools) option(WITH_XDG_DIRS_FALLBACK "Use our XDG_CONFIG_DIRS fallback" ON) set(LXQT_BUILD_TOOLS_MAJOR_VERSION 0) -set(LXQT_BUILD_TOOLS_MINOR_VERSION 11) +set(LXQT_BUILD_TOOLS_MINOR_VERSION 12) set(LXQT_BUILD_TOOLS_PATCH_VERSION 0) set(LXQT_BUILD_TOOLS_VERSION ${LXQT_BUILD_TOOLS_MAJOR_VERSION}.${LXQT_BUILD_TOOLS_MINOR_VERSION}.${LXQT_BUILD_TOOLS_PATCH_VERSION}) set(LXQT_MIN_LINGUIST_VERSION "5.15.0") diff -pruN 0.11.0-2/debian/changelog 0.12.0-0ubuntu3/debian/changelog --- 0.11.0-2/debian/changelog 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/changelog 2023-01-25 17:36:17.000000000 +0000 @@ -1,3 +1,27 @@ +lxqt-build-tools (0.12.0-0ubuntu3) lunar; urgency=medium + + * Build using C++17 by default instead of C++14, to be compatible with KDE + Frameworks and Qt. + + -- Simon Quigley Wed, 25 Jan 2023 11:36:17 -0600 + +lxqt-build-tools (0.12.0-0ubuntu2) lunar; urgency=medium + + * Added 'Rules-Requires-Root: no'. + * Overhauled copyright file. + + -- Aaron Rainbolt Sun, 27 Nov 2022 13:48:55 -0600 + +lxqt-build-tools (0.12.0-0ubuntu1) lunar; urgency=medium + + * New upstream release. + * Actually fix the uscan error. Thanks for the help, arraybolt3! + * Lubuntuify the package slightly, to make debhelper happy. + * Remove upstream-applicable patch. + * Brief copyright update. + + -- Simon Quigley Wed, 16 Nov 2022 17:04:59 -0600 + lxqt-build-tools (0.11.0-2) unstable; urgency=medium * debian/watch: fix uscan error. diff -pruN 0.11.0-2/debian/control 0.12.0-0ubuntu3/debian/control --- 0.11.0-2/debian/control 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/control 2023-01-25 17:35:52.000000000 +0000 @@ -1,5 +1,6 @@ Source: lxqt-build-tools -Maintainer: LXQt Packaging Team +Maintainer: Lubuntu Developers +XSBC-Original-Maintainer: LXQt Packaging Team Uploaders: Alf Gaida , Andrew Lee (李健秋) , ChangZhuo Chen (陳昌倬) @@ -11,9 +12,12 @@ Build-Depends: debhelper-compat (= 13), pkg-config, qtbase5-dev Standards-Version: 4.6.1 -Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools -Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git +Vcs-Browser: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging +Vcs-Git: https://git.lubuntu.me/Lubuntu/lxqt-build-tools-packaging.git +XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/lxqt-build-tools +XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/lxqt-build-tools.git Homepage: https://github.com/lxqt/lxqt-build-tools +Rules-Requires-Root: no Package: lxqt-build-tools Architecture: all diff -pruN 0.11.0-2/debian/copyright 0.12.0-0ubuntu3/debian/copyright --- 0.11.0-2/debian/copyright 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/copyright 2023-01-25 17:35:52.000000000 +0000 @@ -7,11 +7,37 @@ Copyright: 2012-2021 LXQt team 2010-2012 Razor team License: BSD-3-Clause -Files: cmake/find-modules/FindXdgEmail.cmake - cmake/find-modules/FindXdgMime.cmake cmake/find-modules/FindXdgOpen.cmake - cmake/find-modules/FindXdgScreensaver.cmake - cmake/find-modules/FindXdgSettings.cmake -Copyright: 2019, Luís Pereira +Files: lxqt-transupdate + cmake/find-modules/FindClazy.cmake + cmake/find-modules/FindFontconfig.cmake + cmake/find-modules/FindUDev.cmake + cmake/find-modules/FindXCB.cmake + cmake/find-modules/FindXdgEmail.cmake + cmake/find-modules/FindXdgMime.cmake + cmake/find-modules/FindXdgOpen.cmake + cmake/find-modules/FindXdgScreensaver.cmake + cmake/find-modules/FindXdgSettings.cmake + cmake/find-modules/FindXdgUserDirs.cmake + cmake/find-modules/FindXKBCommon.cmake + cmake/find-modules/FindXTerm.cmake + cmake/modules/ECMFindModuleHelpers.cmake + cmake/modules/LXQtCompilerSettings.cmake + cmake/modules/LXQtCreatePkgConfigFile.cmake + cmake/modules/LXQtCreatePortableHeaders.cmake + cmake/modules/LXQtPreventInSourceBuilds.cmake + cmake/modules/LXQtTranslate.cmake + cmake/modules/LXQtTranslateTs.cmake.in + cmake/modules/LXQtTranslationLoader.cmake + cmake/modules/Qt5TranslationLoader.cmake +Copyright: 2018 Alf Gaida + 2014-2020 Luís Pereira + 2006-2007 Laurent Montel + 2018 Volker Krause + 2010 Rafael Fernández López + 2015 Jari Vetoniemi + 2014 Alex Merry + 2015 Palo Kisa + 2013 Hong Jen Yee (PCMan) License: BSD-3-Clause Files: debian/* @@ -22,8 +48,13 @@ Copyright: 2020 Raphaël Hertzog 2022 Andrew Lee (李健秋) 2022 Severus Septimius + 2022 Aaron Rainbolt + 2022 Simon Quigley License: BSD-3-Clause +Files: debian/usr/share/lxqt-build-tools/repository.spec.example +License: WTFPL-2 + License: BSD-3-Clause Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions @@ -49,3 +80,14 @@ License: BSD-3-Clause NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +License: WTFPL-2 + Copyright (C) 2004 Sam Hocevar + . + Everyone is permitted to copy and distribute verbatim or modified + copies of this license document, and changing it is allowed as long + as the name is changed. + . + DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + . + 0. You just DO WHAT THE FUCK YOU WANT TO. diff -pruN 0.11.0-2/debian/patches/cpp17.patch 0.12.0-0ubuntu3/debian/patches/cpp17.patch --- 0.11.0-2/debian/patches/cpp17.patch 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/patches/cpp17.patch 2023-01-25 17:36:17.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Bump the minimum compatibility level to C++17 +Author: Simon Quigley +Origin: vendor +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1029611 +Forwarded: https://github.com/lxqt/lxqt-build-tools/pull/83 +Last-Update: 2023-01-25 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/cmake/modules/LXQtCompilerSettings.cmake ++++ b/cmake/modules/LXQtCompilerSettings.cmake +@@ -181,11 +181,11 @@ endif() + + + #----------------------------------------------------------------------------- +-# CXX14 requirements - no checks, we just set it ++# CXX17 requirements - no checks, we just set it + #----------------------------------------------------------------------------- + set(CMAKE_CXX_STANDARD_REQUIRED True) + set(CMAKE_CXX_EXTENSIONS OFF) +-set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ ISO Standard") ++set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ ISO Standard") + + + #----------------------------------------------------------------------------- diff -pruN 0.11.0-2/debian/patches/series 0.12.0-0ubuntu3/debian/patches/series --- 0.11.0-2/debian/patches/series 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/patches/series 2023-01-25 17:36:17.000000000 +0000 @@ -1 +1 @@ -use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch +cpp17.patch diff -pruN 0.11.0-2/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch 0.12.0-0ubuntu3/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch --- 0.11.0-2/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/patches/use-gdesktopappinfo-h-to-find-gio-unix-2-0.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From 7aebedfa7bf103a2eb900a3b560c7bad3761e8bc Mon Sep 17 00:00:00 2001 -From: Zamir SUN -Date: Tue, 12 Jul 2022 20:46:56 +0800 -Subject: [PATCH] FindGLIB.cmake: Use gdesktopappinfo.h to find gio-unix-2.0 -Applied-Upstream: https://github.com/lxqt/lxqt-build-tools/pull/79 - -In glib2 2.73.1 gunixfdlist have been moved into glib-2.0 - - sh-5.1# rpm -ql glib2-devel | grep gio/gunixfdlist.h -/usr/include/glib-2.0/gio/gunixfdlist.h - sh-5.1# rpm -q glib2-devel -glib2-devel-2.73.1-2.fc37.x86_64 - -So using gdesktopappinfo.h for gio-unix-2.0. - -Fixes: https://github.com/lxqt/lxqt-build-tools/issues/78 - -Signed-off-by: Zamir SUN ---- - cmake/find-modules/FindGLIB.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/find-modules/FindGLIB.cmake b/cmake/find-modules/FindGLIB.cmake -index bb2336a..c6a06f7 100644 ---- a/cmake/find-modules/FindGLIB.cmake -+++ b/cmake/find-modules/FindGLIB.cmake -@@ -101,7 +101,7 @@ foreach (_component ${GLIB_FIND_COMPONENTS}) - elseif (${_component} STREQUAL "gio-unix") - pkg_check_modules(GIO_UNIX gio-unix-2.0) - find_path(GLIB_GIO_UNIX_INCLUDE_DIR -- NAMES gio/gunixfdlist.h -+ NAMES gio/gdesktopappinfo.h - HINTS ${GIO_UNIX_INCLUDEDIR} - PATH_SUFFIXES gio-unix-2.0) - diff -pruN 0.11.0-2/debian/watch 0.12.0-0ubuntu3/debian/watch --- 0.11.0-2/debian/watch 2022-10-22 10:45:37.000000000 +0000 +++ 0.12.0-0ubuntu3/debian/watch 2023-01-25 17:35:52.000000000 +0000 @@ -1,3 +1,5 @@ version=4 -opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/lxqt-build-tools-$1\.tar\.gz/,pgpsigurlmangle=s/$/.asc/ \ - https://github.com/lxqt/lxqt-build-tools/tags .*/v?(\d\S*)\.tar\.gz +opts="searchmode=plain, \ +pgpsigurlmangle=s/$/.asc/, \ +uversionmangle=s/(\d+\.\d+\.\d+).*/$1/" \ + https://api.github.com/repos/lxqt/@PACKAGE@/releases https:\/\/github.com\/lxqt\/@PACKAGE@\/releases\/download\/@ANY_VERSION@\/@PACKAGE@-@ANY_VERSION@.tar.xz