Hello community, here is the log from the commit of package obconf-qt for openSUSE:Factory checked in at 2018-06-29 22:23:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obconf-qt (Old) and /work/SRC/openSUSE:Factory/.obconf-qt.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obconf-qt" Fri Jun 29 22:23:39 2018 rev:4 rq:618037 version:0.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/obconf-qt/obconf-qt.changes 2017-10-24 22:23:26.364241409 +0200 +++ /work/SRC/openSUSE:Factory/.obconf-qt.new/obconf-qt.changes 2018-06-29 22:23:42.574605090 +0200 @@ -1,0 +2,17 @@ +Tue May 22 14:32:49 UTC 2018 - [email protected] + +- Update to 0.12.0: + * Bumped minor version to 13 + * Spanish translation update + * CMake: Prevent in-source builds + * fixed lxde mentions + * Add Traditional Chinese translation + * Add Traditional Chinese translation + * Add Simplified Chinese translation + * Fixes Qt4 build + * cmake: Use LXQtCompilerSettings + * cmake: Handle CMP0071 + * cmake: Make it compile with Qt4 + * cmake: Update CMake minimum required version + +------------------------------------------------------------------- Old: ---- obconf-qt-0.12.0.tar.xz obconf-qt-0.12.0.tar.xz.asc New: ---- obconf-qt-0.13.0.tar.xz obconf-qt-0.13.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obconf-qt.spec ++++++ --- /var/tmp/diff_new_pack.2G4kFM/_old 2018-06-29 22:23:43.202604619 +0200 +++ /var/tmp/diff_new_pack.2G4kFM/_new 2018-06-29 22:23:43.202604619 +0200 @@ -1,7 +1,7 @@ # # spec file for package obconf-qt # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,19 @@ Name: obconf-qt -Version: 0.12.0 +Version: 0.13.0 Release: 0 Summary: OpenBox window manager configuration tool -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: System/GUI/LXQt -Url: http://www.lxqt.org +URL: http://www.lxqt.org Source: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: https://github.com/lxde/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz.asc Source2: %{name}.keyring BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ BuildRequires: hicolor-icon-theme -BuildRequires: lxqt-build-tools-devel +BuildRequires: lxqt-build-tools-devel >= 0.5.0 BuildRequires: pkgconfig BuildRequires: cmake(KF5WindowSystem) BuildRequires: cmake(Qt5LinguistTools) @@ -45,7 +45,6 @@ Requires(pre): desktop-file-utils Recommends: %{name}-lang Conflicts: obconf -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Configuration tool for the OpenBox Window Manager. @@ -86,8 +85,8 @@ fi %files -%defattr(-,root,root) -%doc AUTHORS COPYING README.md +%license COPYING +%doc AUTHORS README.md %{_bindir}/obconf %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop ++++++ obconf-qt-0.12.0.tar.xz -> obconf-qt-0.13.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/CHANGELOG new/obconf-qt-0.13.0/CHANGELOG --- old/obconf-qt-0.12.0/CHANGELOG 2017-09-24 12:49:48.000000000 +0200 +++ new/obconf-qt-0.13.0/CHANGELOG 2018-05-21 19:40:12.000000000 +0200 @@ -1,7 +1,24 @@ -obconf-qt-0.12.0 / 2017-09-24 +obconf-qt-0.13.0 / 2018-05-21 ============================= + * Bumped minor version to 13 + * Spanish translation update + * CMake: Prevent in-source builds + * fixed lxde mentions + * Add Traditional Chinese translation + * Add Traditional Chinese translation + * Add Simplified Chinese translation + * Fixes Qt4 build + * cmake: Use LXQtCompilerSettings + * cmake: Handle CMP0071 + * cmake: Make it compile with Qt4 + * cmake: Update CMake minimum required version + +0.12.0 / 2017-09-24 +=================== + + * Release 0.12.0: Update changelog * Bump version to 0.12.0 * Don't export github templates * Added Lithuanian language diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/CMakeLists.txt new/obconf-qt-0.13.0/CMakeLists.txt --- old/obconf-qt-0.12.0/CMakeLists.txt 2017-09-24 12:49:48.000000000 +0200 +++ new/obconf-qt-0.13.0/CMakeLists.txt 2018-05-21 19:40:12.000000000 +0200 @@ -1,12 +1,18 @@ project(obconf-qt) # newer cmake is required for CMAKE_AUTOMOC Qt support -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) find_program(SED_PROGRAM sed) include(GNUInstallDirs) -set(LXQTBT_MINIMUM_VERSION "0.1.0") +set(LXQTBT_MINIMUM_VERSION "0.5.0") + +set(OBCONFQT_MAJOR_VERSION 0) +set(OBCONFQT_MINOR_VERSION 13) +set(OBCONFQT_PATCH_VERSION 0) +set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION}) +add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"") # Support Qt4 for the time being option(USE_QT4 "Build with Qt4." $ENV{USE_QT4}) @@ -14,15 +20,18 @@ set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(CMAKE_AUTOMOC ON) + if(USE_QT4) + set(USE_QT5 FALSE) find_package(Qt4 REQUIRED QtCore QtGui) # Qt include(${QT_USE_FILE}) message(STATUS "Building with Qt${QTVERSION}") else() - cmake_minimum_required(VERSION 2.8.11) + set(USE_QT5 TRUE) + cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR) find_package(Qt5Widgets REQUIRED) find_package(Qt5X11Extras REQUIRED) - find_package(Qt5LinguistTools REQUIRED QUIET) + find_package(Qt5LinguistTools REQUIRED) message(STATUS "Building with Qt${Qt5Core_VERSION}") endif() @@ -42,15 +51,11 @@ set(CMAKE_BUILD_TYPE Release) endif() -set(OBCONFQT_MAJOR_VERSION 0) -set(OBCONFQT_MINOR_VERSION 12) -set(OBCONFQT_PATCH_VERSION 0) -set(OBCONFQT_VERSION ${OBCONFQT_MAJOR_VERSION}.${OBCONFQT_MINOR_VERSION}.${OBCONFQT_PATCH_VERSION}) -add_definitions("-DOBCONFQT_VERSION=\"${OBCONFQT_VERSION}\"") - +include(LXQtPreventInSourceBuilds) include(LXQtTranslateTs) include(LXQtTranslateDesktop) include(LXQtCompilerSettings) +include(LXQtCompilerSettings NO_POLICY_SCOPE) # add src subdirectory add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/README.md new/obconf-qt-0.13.0/README.md --- old/obconf-qt-0.12.0/README.md 2017-09-24 12:49:48.000000000 +0200 +++ new/obconf-qt-0.13.0/README.md 2018-05-21 19:40:12.000000000 +0200 @@ -11,7 +11,7 @@ ### Compiling source code Runtime dependencies are Qt X11 Extras, gtk-update-icon-cache, hicolor-icon-theme and Openbox. -Additional build dependencies are CMake and [liblxqt](https://github.com/lxde/liblxqt), optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxde/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. +Additional build dependencies are CMake and [liblxqt](https://github.com/lxqt/liblxqt), optionally Git to pull latest VCS checkouts. The localization files were outsourced to repository [lxqt-l10n](https://github.com/lxqt/lxqt-l10n) so the corresponding dependencies are needed, too. Please refer to this repository's `README.md` for further information. Code configuration is handled by CMake. CMake variable `CMAKE_INSTALL_PREFIX` has to be set to `/usr` on most operating systems. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/src/CMakeLists.txt new/obconf-qt-0.13.0/src/CMakeLists.txt --- old/obconf-qt-0.12.0/src/CMakeLists.txt 2017-09-24 12:49:48.000000000 +0200 +++ new/obconf-qt-0.13.0/src/CMakeLists.txt 2018-05-21 19:40:12.000000000 +0200 @@ -42,6 +42,8 @@ qt5_wrap_ui(obconf-qt_UI_H ${obconf-qt_UIS}) endif() +set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) + # The ui code generated by Qt uic contains QMetaObject::connectSlotsByName() # but we don't want that. Fix it with sed. add_custom_command( @@ -58,8 +60,8 @@ # add translation for obconf-qt option (UPDATE_TRANSLATIONS "Update source translation translations/*.ts files" OFF) lxqt_translate_ts(QM_FILES - USE_QT4 - ${USE_QT4} + USE_QT5 + ${USE_QT5} UPDATE_TRANSLATIONS ${UPDATE_TRANSLATIONS} SOURCES @@ -100,6 +102,10 @@ -DTHEME_DIR="${CMAKE_INSTALL_FULL_DATAROOTDIR}/openbox/themes" ) +if (USE_QT4) + add_definitions(-DUSE_QT4) +endif() + target_link_libraries(obconf-qt ${QTX_LIBRARIES} ${GLIB_LIBRARIES} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/src/obconf-qt.cpp new/obconf-qt-0.13.0/src/obconf-qt.cpp --- old/obconf-qt-0.12.0/src/obconf-qt.cpp 2017-09-24 12:49:48.000000000 +0200 +++ new/obconf-qt-0.13.0/src/obconf-qt.cpp 2018-05-21 19:40:12.000000000 +0200 @@ -180,7 +180,9 @@ int main(int argc, char** argv) { QApplication app(argc, argv); +#ifndef USE_QT4 app.setAttribute(Qt::AA_UseHighDpiPixmaps, true); +#endif // load translations QTranslator qtTranslator, translator; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/src/translations/obconf-qt_es.desktop new/obconf-qt-0.13.0/src/translations/obconf-qt_es.desktop --- old/obconf-qt-0.12.0/src/translations/obconf-qt_es.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/obconf-qt-0.13.0/src/translations/obconf-qt_es.desktop 2018-05-21 19:40:12.000000000 +0200 @@ -0,0 +1,3 @@ +Name[es]=Configuración de Openbox +GenericName[es]=Configuración del gestor de ventanas +Comment[es]=Configurar el gestor de ventanas Openbox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/src/translations/obconf-qt_zh_CN.desktop new/obconf-qt-0.13.0/src/translations/obconf-qt_zh_CN.desktop --- old/obconf-qt-0.12.0/src/translations/obconf-qt_zh_CN.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/obconf-qt-0.13.0/src/translations/obconf-qt_zh_CN.desktop 2018-05-21 19:40:12.000000000 +0200 @@ -0,0 +1,3 @@ +Name[zh_CN]=Openbox 设置 +GenericName[zh_CN]=窗口管理器设置 +Comment[zh_CN]=配置窗口管理器 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obconf-qt-0.12.0/src/translations/obconf-qt_zh_TW.desktop new/obconf-qt-0.13.0/src/translations/obconf-qt_zh_TW.desktop --- old/obconf-qt-0.12.0/src/translations/obconf-qt_zh_TW.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/obconf-qt-0.13.0/src/translations/obconf-qt_zh_TW.desktop 2018-05-21 19:40:12.000000000 +0200 @@ -0,0 +1,3 @@ +Name[zh_TW]=Openbox 設定 +GenericName[zh_TW]=視窗管理員設定 +Comment[zh_TW]=設定視窗管理員
