commit libqt5-qtx11extras for openSUSE:Factory

29 Jun 2022

Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package libqt5-qtx11extras for openSUSE:Factory checked in at 2022-06-29 16:00:47
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libqt5-qtx11extras (Old)
 and      /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "libqt5-qtx11extras"

Wed Jun 29 16:00:47 2022 rev:43 rq:985502 version:5.15.5+kde0

Changes:
--------

--- /work/SRC/openSUSE:Factory/libqt5-qtx11extras/libqt5-qtx11extras.changes	2021-06-27 18:59:49.128334142 +0200
+++ /work/SRC/openSUSE:Factory/.libqt5-qtx11extras.new.1548/libqt5-qtx11extras.changes	2022-06-29 16:01:33.160638231 +0200
@@ -1,0 +2,8 @@
+Mon Jun 27 13:10:57 UTC 2022 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to version 5.15.5+kde0, rebased upstream:
+  * Revert "Update commercial license headers"
+  * Update commercial license headers
+- Drop 0001-Revert-Bump-version.patch, it's versioned correctly now
+
+-------------------------------------------------------------------

Old:
----
  0001-Revert-Bump-version.patch
  qtx11extras-everywhere-src-5.15.2+kde1.obscpio

New:
----
  qtx11extras-everywhere-src-5.15.5+kde0.obscpio

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libqt5-qtx11extras.spec ++++++
--- /var/tmp/diff_new_pack.TuKzVQ/_old	2022-06-29 16:01:34.116639504 +0200
+++ /var/tmp/diff_new_pack.TuKzVQ/_new	2022-06-29 16:01:34.120639509 +0200
@@ -19,11 +19,11 @@
 %define qt5_snapshot 1
 %define libname libQt5X11Extras5
 %define base_name libqt5
-%define real_version 5.15.2
-%define so_version 5.15.2
+%define real_version 5.15.5
+%define so_version 5.15.5
 %define tar_version qtx11extras-everywhere-src-%{version}
 Name:           libqt5-qtx11extras
-Version:        5.15.2+kde1
+Version:        5.15.5+kde0
 Release:        0
 Summary:        Qt 5 X11 Extras Addon
 License:        LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later)
@@ -31,8 +31,6 @@
 URL:            https://www.qt.io
 Source:         %{tar_version}.tar.xz
 Source1:        baselibs.conf
-# PATCH-FIX-OPENSUSE
-Patch1:         0001-Revert-Bump-version.patch
 BuildRequires:  fdupes
 BuildRequires:  libQt5Gui-private-headers-devel >= %{real_version}
 BuildRequires:  libQt5PlatformHeaders-devel >= %{real_version}

++++++ _service ++++++
--- /var/tmp/diff_new_pack.TuKzVQ/_old	2022-06-29 16:01:34.152639551 +0200
+++ /var/tmp/diff_new_pack.TuKzVQ/_new	2022-06-29 16:01:34.156639557 +0200
@@ -1,12 +1,12 @@
 <services>
   <service name="obs_scm" mode="disabled">
    <param name="changesgenerate">enable</param>
-   <param name="versionformat">5.15.2+kde@TAG_OFFSET@</param>
+   <param name="versionformat">5.15.5+kde@TAG_OFFSET@</param>
    <param name="url">https://invent.kde.org/qt/qt/qtx11extras.git</param>
    <param name="scm">git</param>
    <param name="filename">qtx11extras-everywhere-src</param>
    <param name="revision">kde/5.15</param>
-   <param name="parent-tag">v5.15.2</param>
+   <param name="parent-tag">v5.15.5-lts-lgpl</param>
    <param name="changesgenerate">enable</param>
   </service>
   <service name="set_version" mode="disabled"/>

++++++ qtx11extras-everywhere-src-5.15.2+kde1.obscpio -> qtx11extras-everywhere-src-5.15.5+kde0.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-everywhere-src-5.15.2+kde1/.gitignore new/qtx11extras-everywhere-src-5.15.5+kde0/.gitignore
--- old/qtx11extras-everywhere-src-5.15.2+kde1/.gitignore	1970-01-01 01:00:00.000000000 +0100
+++ new/qtx11extras-everywhere-src-5.15.5+kde0/.gitignore	2022-06-02 16:53:34.000000000 +0200
@@ -0,0 +1,126 @@
+# This file is used to ignore files which are generated in the Qt build system
+# ----------------------------------------------------------------------------
+
+callgrind.out.*
+pcviewer.cfg
+*~
+*.a
+*.la
+*.core
+*.moc
+*.o
+*.obj
+*.orig
+*.swp
+*.rej
+*.so
+*.pbxuser
+*.mode1
+*.mode1v3
+*_pch.h.cpp
+*_resource.rc
+.#*
+*.*#
+core
+.qmake.cache
+.qmake.vars
+*.prl
+tags
+.DS_Store
+*.debug
+Makefile*
+*.prl
+*.app
+*.pro.user
+*.qmlproject.user
+*.gcov
+moc_*.cpp
+ui_*.h
+qrc_*.cpp
+
+# Test generated files
+QObject.log
+tst_*
+!tst_*.*
+tst_*.log
+tst_*.debug
+tst_*~
+
+# xemacs temporary files
+*.flc
+
+# Vim temporary files
+.*.swp
+
+# Visual Studio generated files
+*.ib_pdb_index
+*.idb
+*.ilk
+*.pdb
+*.sln
+*.suo
+*.vcproj
+*vcproj.*.*.user
+*.ncb
+*.vcxproj
+*.vcxproj.filters
+*.vcxproj.user
+
+# MinGW generated files
+*.Debug
+*.Release
+
+# Symlinks generated by configure
+.DS_Store
+.pch
+.rcc
+*.app
+
+
+# Directories to ignore
+# ---------------------
+
+debug
+include/*
+include/*/*
+lib/*
+!lib/fonts
+!lib/README
+plugins/*/*
+release
+tmp
+doc-build
+doc/html/*
+doc/qch
+doc-build
+.rcc
+.pch
+.metadata
+
+# runonphone crash dumps
+d_exc_*.txt
+d_exc_*.stk
+
+# Generated by abldfast.bat from devtools.
+.abldsteps.*
+
+# Carbide project files
+# ---------------------
+.project
+.cproject
+.make.cache
+*.d
+
+qtc-debugging-helper
+
+.pc/
+
+# INTEGRITY generated files
+*.gpj
+*.int
+*.ael
+*.dla
+*.dnm
+*.dep
+*.map
+work
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-everywhere-src-5.15.2+kde1/.qmake.conf new/qtx11extras-everywhere-src-5.15.5+kde0/.qmake.conf
--- old/qtx11extras-everywhere-src-5.15.2+kde1/.qmake.conf	2020-10-27 06:49:11.000000000 +0100
+++ new/qtx11extras-everywhere-src-5.15.5+kde0/.qmake.conf	2022-06-02 16:53:34.000000000 +0200
@@ -3,4 +3,4 @@
 CONFIG += warning_clean
 DEFINES += QT_NO_FOREACH
 
-MODULE_VERSION = 5.15.3
+MODULE_VERSION = 5.15.5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtx11extras-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch new/qtx11extras-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch
--- old/qtx11extras-everywhere-src-5.15.2+kde1/0001-Revert-Bump-version.patch	2020-10-27 06:49:11.000000000 +0100
+++ new/qtx11extras-everywhere-src-5.15.5+kde0/0001-Revert-Bump-version.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-From 791a626a173f83ddf855a76dc75634d733032e7f Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fvogt@suse.de>
-Date: Tue, 22 Jun 2021 21:29:41 +0200
-Subject: [PATCH] Revert "Bump version"
-
-This reverts commit 3898f5484fd4864b047729bfeda9a1222f32364f.
----
- .qmake.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/.qmake.conf b/.qmake.conf
-index bbf484f..ba84e23 100644
---- a/.qmake.conf
-+++ b/.qmake.conf
-@@ -3,4 +3,4 @@ load(qt_build_config)
- CONFIG += warning_clean
- DEFINES += QT_NO_FOREACH
- 
--MODULE_VERSION = 5.15.3
-+MODULE_VERSION = 5.15.2
--- 
-2.20.1
-

++++++ qtx11extras-everywhere-src.obsinfo ++++++
--- /var/tmp/diff_new_pack.TuKzVQ/_old	2022-06-29 16:01:34.424639914 +0200
+++ /var/tmp/diff_new_pack.TuKzVQ/_new	2022-06-29 16:01:34.424639914 +0200
@@ -1,6 +1,5 @@
 name: qtx11extras-everywhere-src
-version: 5.15.2+kde1
-mtime: 1603777751
-commit: 3898f5484fd4864b047729bfeda9a1222f32364f
-
+version: 5.15.5+kde0
+mtime: 1654181614
+commit: 0dfaf36ec6f642a0fd583ce1cc33a31eb6b3328e

    

Source-Sync

tags

participants (1)