Control: tags 1037729 + patch Control: tags 1037729 + pending X-Debbugs-CC: cont...@thomaspierson.fr lu...@debian.org
Dear maintainer, I've prepared an NMU for libmygpo-qt (versioned as 1.1.0-4.1) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. The full debdiff is provided in the attachment. Regards. diff -Nru libmygpo-qt-1.1.0/debian/changelog libmygpo-qt- 1.1.0/debian/changelog --- libmygpo-qt-1.1.0/debian/changelog 2020-10-05 03:03:40.000000000 -0400 +++ libmygpo-qt-1.1.0/debian/changelog 2023-08-05 21:43:16.000000000 -0400 @@ -1,3 +1,19 @@ +libmygpo-qt (1.1.0-4.1) unstable; urgency=medium + + * Non-maintainer upload. + * Rebuild against Qt5 5.15.10. + * debian/libmygpo-qt5-1.symbols: Review symbols: + + Drop commented missing symbols. They are from standard c++ library and Qt5 + library that should not be tracked here. + + Drop disappeared symbols in Qt 5.15.10 rebuild (Closes: #1037729). The + newly-disappeared symbols are all Qt5 symbols that are meaningless here. + * debian/patches: + + Re-generate patches using "gbp pq" for unified format. + + fix-tests-because-qt-isodate-behavior-change.patch: Fix patch format to + avoid dpkg-source warning "unexpected end of diff". + + -- Boyuan Yang <by...@debian.org> Sat, 05 Aug 2023 21:43:16 -0400
diff -Nru libmygpo-qt-1.1.0/debian/changelog libmygpo-qt-1.1.0/debian/changelog
--- libmygpo-qt-1.1.0/debian/changelog 2020-10-05 03:03:40.000000000 -0400
+++ libmygpo-qt-1.1.0/debian/changelog 2023-08-05 21:43:16.000000000 -0400
@@ -1,3 +1,19 @@
+libmygpo-qt (1.1.0-4.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild against Qt5 5.15.10.
+ * debian/libmygpo-qt5-1.symbols: Review symbols:
+ + Drop commented missing symbols. They are from standard c++ library and Qt5
+ library that should not be tracked here.
+ + Drop disappeared symbols in Qt 5.15.10 rebuild (Closes: #1037729). The
+ newly-disappeared symbols are all Qt5 symbols that are meaningless here.
+ * debian/patches:
+ + Re-generate patches using "gbp pq" for unified format.
+ + fix-tests-because-qt-isodate-behavior-change.patch: Fix patch format to
+ avoid dpkg-source warning "unexpected end of diff".
+
+ -- Boyuan Yang <by...@debian.org> Sat, 05 Aug 2023 21:43:16 -0400
+
libmygpo-qt (1.1.0-4) unstable; urgency=medium
* Bump standard version to 4.5.0, no changes needed.
diff -Nru libmygpo-qt-1.1.0/debian/libmygpo-qt5-1.symbols libmygpo-qt-1.1.0/debian/libmygpo-qt5-1.symbols
--- libmygpo-qt-1.1.0/debian/libmygpo-qt5-1.symbols 2020-10-05 03:03:40.000000000 -0400
+++ libmygpo-qt-1.1.0/debian/libmygpo-qt5-1.symbols 2023-08-05 21:43:16.000000000 -0400
@@ -8,13 +8,11 @@
_ZN10QByteArrayC2Ev@Base 1.0.9
_ZN10QByteArrayD1Ev@Base 1.0.9
_ZN10QByteArrayD2Ev@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN10QByteArrayaSEOS_@Base 1.0.9
_ZN10QByteArraypLERKS_@Base 1.0.9
(optional=templinst)_ZN12QMapNodeBase25callDestructorIfNecessaryI7QStringEENSt9enable_ifIXsr9QTypeInfoIT_E9isComplexEvE4typeERS4_@Base 1.0.9
(optional=templinst)_ZN12QMapNodeBase25callDestructorIfNecessaryI8QVariantEENSt9enable_ifIXsr9QTypeInfoIT_E9isComplexEvE4typeERS4_@Base 1.0.9
_ZN12QMapNodeBase8setColorENS_5ColorE@Base 1.1.0
_ZN12QMapNodeBase9setParentEPS_@Base 1.1.0
-#MISSING: 1.1.0-4# _ZN4QUrlaSEOS_@Base 1.0.9
_ZN5QCharC1E11QLatin1Char@Base 1.0.9
_ZN5QCharC2E11QLatin1Char@Base 1.0.9
_ZN5mygpo10ApiRequest10searchOpmlERK7QString@Base 1.0.9
@@ -235,13 +233,10 @@
_ZN7QStringC2Ev@Base 1.0.9
_ZN7QStringD1Ev@Base 1.0.9
_ZN7QStringD2Ev@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN7QStringaSEOS_@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN7QStringpLERKS_@Base 1.0.9
_ZN8QVariant7PrivateC1ERKS0_@Base 1.0.9
_ZN8QVariant7PrivateC1Ev@Base 1.0.9
_ZN8QVariant7PrivateC2ERKS0_@Base 1.0.9
_ZN8QVariant7PrivateC2Ev@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN8QVariant8data_ptrEv@Base 1.0.9
(optional=templinst)_ZN8QVariant8setValueI14QSharedPointerIN5mygpo13EpisodeActionEEEEvRKT_@Base 1.0.9
(optional=templinst)_ZN8QVariant8setValueI14QSharedPointerIN5mygpo3TagEEEEvRKT_@Base 1.0.9
(optional=templinst)_ZN8QVariant8setValueI14QSharedPointerIN5mygpo6DeviceEEEEvRKT_@Base 1.0.9
@@ -249,11 +244,7 @@
(optional=templinst)_ZN8QVariant8setValueI14QSharedPointerIN5mygpo7PodcastEEEEvRKT_@Base 1.0.9
_ZN8QVariantC1Ev@Base 1.0.9
_ZN8QVariantC2Ev@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN8QVariantaSEOS_@Base 1.0.9
_ZN9QDateTime4swapERS_@Base 1.0.9
-#MISSING: 1.1.0-4# _ZN9QDateTimeaSEOS_@Base 1.0.9
-#MISSING: 1.1.0-3# _ZN9QListData7disposeEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK10QByteArraycvPKcEv@Base 1.0.9
_ZNK5mygpo10DeviceList10metaObjectEv@Base 1.0.9
_ZNK5mygpo10DeviceList11devicesListEv@Base 1.0.9
_ZNK5mygpo10DeviceList7devicesEv@Base 1.0.9
@@ -333,10 +324,6 @@
_ZNK5mygpo8Settings10metaObjectEv@Base 1.0.9
_ZNK5mygpo8Settings8settingsEv@Base 1.0.9
_ZNK7QString3argEiii5QChar@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK7QString4sizeEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK7QString6isNullEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK7QString7isEmptyEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK7QString9constDataEv@Base 1.0.9
_ZNK8QVariant10isDetachedEv@Base 1.0.9
(optional=templinst)_ZNK8QVariant5valueI14QSharedPointerIN5mygpo13EpisodeActionEEEET_v@Base 1.0.9
(optional=templinst)_ZNK8QVariant5valueI14QSharedPointerIN5mygpo3TagEEEET_v@Base 1.0.9
@@ -344,20 +331,15 @@
(optional=templinst)_ZNK8QVariant5valueI14QSharedPointerIN5mygpo7PodcastEEEET_v@Base 1.0.9
_ZNK8QVariant7isValidEv@Base 1.0.9
_ZNK8QVarianteqERKS_@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK9QListData2atEi@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK9QListData3endEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK9QListData4sizeEv@Base 1.0.9
-#MISSING: 1.1.0-3# _ZNK9QListData5beginEv@Base 1.0.9
- _ZNKR7QString11toLocal8BitEv@Base 1.0.9
_ZNKR7QString8toLatin1Ev@Base 1.0.9
- _ZNO7QString11toLocal8BitEv@Base 1.0.9
_ZNO7QString8toLatin1Ev@Base 1.0.9
(optional=templinst)_ZNSt13__atomic_baseIiEmmEv@Base 1.0.9
-#MISSING: 1.1.0-4# (optional=templinst)_ZNSt13__atomic_baseIiEppEv@Base 1.0.9
(optional=templinst)_ZSt11__addressofIN13QNetworkReply12NetworkErrorEEPT_RS2_@Base 1.1.0
+ (optional=templinst)_ZSt23__is_constant_evaluatedv@Base 1.1.0
(optional=templinst)_ZSt4moveIRN8QVariant7PrivateEEONSt16remove_referenceIT_E4typeEOS4_@Base 1.0.9
(optional=templinst)_ZSt4swapIN8QVariant7PrivateEENSt9enable_ifIXsrSt6__and_IJSt6__not_ISt15__is_tuple_likeIT_EESt21is_move_constructibleIS6_ESt18is_move_assignableIS6_EEE5valueEvE4typeERS6_SG_@Base 1.0.9
(optional=templinst)_ZSt9addressofIN13QNetworkReply12NetworkErrorEEPT_RS2_@Base 1.1.0
+ (optional=templinst)_ZStanSt12memory_orderSt23__memory_order_modifier@Base 1.1.0
_ZTIN5mygpo10DeviceListE@Base 1.0.9
_ZTIN5mygpo11EpisodeListE@Base 1.0.9
_ZTIN5mygpo11PodcastListE@Base 1.0.9
diff -Nru libmygpo-qt-1.1.0/debian/patches/fix-install-paths.patch libmygpo-qt-1.1.0/debian/patches/fix-install-paths.patch
--- libmygpo-qt-1.1.0/debian/patches/fix-install-paths.patch 2018-05-02 17:09:39.000000000 -0400
+++ libmygpo-qt-1.1.0/debian/patches/fix-install-paths.patch 2023-08-05 21:41:43.000000000 -0400
@@ -1,13 +1,21 @@
-Description: fix installation paths
- Use GNUInstallDirs in CMake configuration to use the proper library
- and include directories in multiarch systems.
-Author: Jérémy Bobbio <lu...@debian.org>
+From: Jérémy Bobbio <lu...@debian.org>
+Date: Sat, 5 Aug 2023 21:36:50 -0400
+Subject: fix installation paths
-Index: git/CMakeLists.txt
-===================================================================
---- git.orig/CMakeLists.txt
-+++ git/CMakeLists.txt
-@@ -95,11 +95,9 @@ set( CPACK_PACKAGE_VERSION "${MYGPO_QT_V
+Use GNUInstallDirs in CMake configuration to use the proper library
+and include directories in multiarch systems.
+---
+ CMakeLists.txt | 10 ++++------
+ cmake/modules/FindQJSON.cmake | 3 ++-
+ libmygpo-qt.pc.in | 4 ++--
+ src/CMakeLists.txt | 4 ++--
+ 4 files changed, 10 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2a1f652..ed6f075 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -95,11 +95,9 @@ set( CPACK_PACKAGE_VERSION "${MYGPO_QT_VERSION}" )
set( CPACK_DEBIAN_PACKAGE_MAINTAINER "gpod...@freelists.org" )
set( CPACK_PACKAGE_DESCRIPTION_SUMMARY "A c++/qt library to access the APIs provided by gpodder.net." )
@@ -31,11 +39,11 @@
ENDIF (PKG_CONFIG_FOUND)
ENDIF (NOT WIN32)
-Index: git/cmake/modules/FindQJSON.cmake
-===================================================================
---- git.orig/cmake/modules/FindQJSON.cmake
-+++ git/cmake/modules/FindQJSON.cmake
-@@ -14,6 +14,7 @@ if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIE
+diff --git a/cmake/modules/FindQJSON.cmake b/cmake/modules/FindQJSON.cmake
+index 936d93b..cf5e6a3 100644
+--- a/cmake/modules/FindQJSON.cmake
++++ b/cmake/modules/FindQJSON.cmake
+@@ -14,6 +14,7 @@ if (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
if (NOT WIN32)
@@ -43,7 +51,7 @@
# use pkg-config to get the values of QJSON_INCLUDE_DIRS
# and QJSON_LIBRARY_DIRS to add as hints to the find commands.
include (FindPkgConfig)
-@@ -25,7 +26,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRAR
+@@ -25,7 +26,7 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
qjson
PATHS
${QJSON_LIBRARY_DIRS}
@@ -52,23 +60,10 @@
${KDE4_LIB_DIR}
)
-Index: git/src/CMakeLists.txt
-===================================================================
---- git.orig/src/CMakeLists.txt
-+++ git/src/CMakeLists.txt
-@@ -83,6 +83,6 @@ target_link_libraries( ${MYGPO_QT_TARGET
- set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL)
- qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network )
-
--install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} )
-+install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-
--install( FILES ${LIBMYGPO_QT_INSTALL_H} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
-+install( FILES ${LIBMYGPO_QT_INSTALL_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mygpo-qt${MYGPO_QT_VERSION_SUFFIX} COMPONENT Devel )
-Index: git/libmygpo-qt.pc.in
-===================================================================
---- git.orig/libmygpo-qt.pc.in
-+++ git/libmygpo-qt.pc.in
+diff --git a/libmygpo-qt.pc.in b/libmygpo-qt.pc.in
+index 8403e48..b5c66f4 100644
+--- a/libmygpo-qt.pc.in
++++ b/libmygpo-qt.pc.in
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
@@ -79,3 +74,16 @@
Name: libmygpo-qt@MYGPO_QT_VERSION_SUFFIX@
Description: libmygpo-qt is a C++/Qt Library that wraps the gpodder.net WebAPI
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 802125b..8111ec2 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -83,6 +83,6 @@ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LI
+ set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL)
+ qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network )
+
+-install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} )
++install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+
+-install( FILES ${LIBMYGPO_QT_INSTALL_H} DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel )
++install( FILES ${LIBMYGPO_QT_INSTALL_H} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/mygpo-qt${MYGPO_QT_VERSION_SUFFIX} COMPONENT Devel )
diff -Nru libmygpo-qt-1.1.0/debian/patches/fix-tests-because-qt-isodate-behavior-change.patch libmygpo-qt-1.1.0/debian/patches/fix-tests-because-qt-isodate-behavior-change.patch
--- libmygpo-qt-1.1.0/debian/patches/fix-tests-because-qt-isodate-behavior-change.patch 2018-09-30 05:45:50.000000000 -0400
+++ libmygpo-qt-1.1.0/debian/patches/fix-tests-because-qt-isodate-behavior-change.patch 2023-08-05 21:41:36.000000000 -0400
@@ -1,12 +1,19 @@
-Description: fix tests matching because of Qt::ISODate behavior change
- Fix some tests results matching because since Qt5.11 milliseconds are now
- included in the returned string when calling QTime::toString(Qt::ISODate).
- See the Qt bug QTBUG-30250.
-Author: Thomas Pierson <cont...@thomaspierson.fr>
+From: Thomas Pierson <cont...@thomaspierson.fr>
+Date: Sun, 30 Sep 2018 10:57:14 +0200
+Subject: fix tests matching because of Qt::ISODate behavior change
+Fix some tests results matching because since Qt5.11 milliseconds are now
+included in the returned string when calling QTime::toString(Qt::ISODate).
+See the Qt bug QTBUG-30250.
+---
+ tests/JsonCreatorTest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/JsonCreatorTest.cpp b/tests/JsonCreatorTest.cpp
+index feb03d5..f2f3dfb 100644
--- a/tests/JsonCreatorTest.cpp
+++ b/tests/JsonCreatorTest.cpp
-@@ -100,7 +100,7 @@
+@@ -100,7 +100,7 @@ void JsonCreatorTest::testSaveSettingsToJSON()
output = JsonCreator::saveSettingsToJSON(set, remove);
QString outString2 = QString::fromLatin1( output ).replace( QLatin1String(" "), QLatin1String("") );
@@ -14,3 +21,4 @@
+ QString expected2( QLatin1String( "{\"remove\":[\"setting1\",\"setting2\"],\"set\":{\"setting4\":\"stringvalue\",\"setting5\":\"1998-01-01T00:01:02.000\",\"setting6\":4}}" ) );
QCOMPARE( outString2, expected2 );
+
signature.asc
Description: This is a digitally signed message part
