openSUSE Commits
Threads by month
- ----- 2025 -----
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
October 2023
- 1 participants
- 2656 discussions
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gqrx for openSUSE:Factory checked in at 2023-10-30 22:10:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gqrx (Old)
and /work/SRC/openSUSE:Factory/.gqrx.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gqrx"
Mon Oct 30 22:10:25 2023 rev:4 rq:1121032 version:2.17.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/gqrx/gqrx.changes 2023-10-12 23:48:10.490073747 +0200
+++ /work/SRC/openSUSE:Factory/.gqrx.new.17445/gqrx.changes 2023-10-30 22:10:41.368004389 +0100
@@ -1,0 +2,6 @@
+Sun Oct 22 12:34:01 UTC 2023 - Wojciech Kazubski <wk(a)ire.pw.edu.pl>
+
+- Update to version 2.17.3
+ * Fixed: Delete key shortcut for bookmark removal.
+
+-------------------------------------------------------------------
Old:
----
gqrx-2.17.2.tar.gz
New:
----
gqrx-2.17.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gqrx.spec ++++++
--- /var/tmp/diff_new_pack.7zPh1Z/_old 2023-10-30 22:10:41.988027262 +0100
+++ /var/tmp/diff_new_pack.7zPh1Z/_new 2023-10-30 22:10:41.988027262 +0100
@@ -17,7 +17,7 @@
Name: gqrx
-Version: 2.17.2
+Version: 2.17.3
Release: 0
Summary: Software defined radio receiver
License: GPL-3.0-only
++++++ gqrx-2.17.2.tar.gz -> gqrx-2.17.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gqrx-2.17.2/CMakeLists.txt new/gqrx-2.17.3/CMakeLists.txt
--- old/gqrx-2.17.2/CMakeLists.txt 2023-10-10 02:47:54.000000000 +0200
+++ new/gqrx-2.17.3/CMakeLists.txt 2023-10-21 04:42:43.000000000 +0200
@@ -4,7 +4,7 @@
project(gqrx)
set(${PROJECT_NAME}_MAJOR "2")
set(${PROJECT_NAME}_MINOR "17")
-set(${PROJECT_NAME}_PATCH "2")
+set(${PROJECT_NAME}_PATCH "3")
set(IS_RELEASE TRUE)
if(IS_RELEASE)
@@ -126,7 +126,7 @@
option(FORCE_QT5 "Force Qt5 to be used" OFF)
if(FORCE_QT6)
- find_package(Qt6 QUIET COMPONENTS Core Network Widgets Svg SvgWidgets)
+ find_package(Qt6 REQUIRED COMPONENTS Core Network Widgets Svg SvgWidgets)
elseif(FORCE_QT5)
find_package(Qt5 REQUIRED COMPONENTS Core Network Widgets Svg)
else()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gqrx-2.17.2/README.md new/gqrx-2.17.3/README.md
--- old/gqrx-2.17.2/README.md 2023-10-10 02:47:54.000000000 +0200
+++ new/gqrx-2.17.3/README.md 2023-10-21 04:42:43.000000000 +0200
@@ -23,6 +23,7 @@
Gqrx is distributed as a source code package and binaries for Linux and Mac.
Many Linux distributions provide gqrx in their package repositories.
Alternate Mac support is available through [MacPorts](https://ports.macports.org/port/gqrx/summary) and [Homebrew](https://formulae.brew.sh/cask/gqrx).
+Windows support is available through [radioconda](https://github.com/ryanvolz/radioconda#radioconda).
* [Official releases](https://github.com/gqrx-sdr/gqrx/releases)
* [Pre-release builds](https://github.com/gqrx-sdr/gqrx/actions?query=workflow%3ABuild+bra…
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gqrx-2.17.2/resources/gqrx.1 new/gqrx-2.17.3/resources/gqrx.1
--- old/gqrx-2.17.2/resources/gqrx.1 2023-10-10 02:47:54.000000000 +0200
+++ new/gqrx-2.17.3/resources/gqrx.1 2023-10-21 04:42:43.000000000 +0200
@@ -1,4 +1,4 @@
-.TH GQRX "1" "October 9, 2023" "gqrx 2.17.2" "User Commands"
+.TH GQRX "1" "October 20, 2023" "gqrx 2.17.3" "User Commands"
.SH NAME
gqrx \- Software Defined Radio GUI application
.SH DESCRIPTION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gqrx-2.17.2/resources/news.txt new/gqrx-2.17.3/resources/news.txt
--- old/gqrx-2.17.2/resources/news.txt 2023-10-10 02:47:54.000000000 +0200
+++ new/gqrx-2.17.3/resources/news.txt 2023-10-21 04:42:43.000000000 +0200
@@ -1,4 +1,9 @@
+ 2.17.3: Released October 20, 2023
+
+ FIXED: Delete key shortcut for bookmark removal.
+
+
2.17.2: Released October 9, 2023
NEW: FORCE_QT6 and FORCE_QT5 CMake options to force Qt version.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gqrx-2.17.2/src/qtgui/dockbookmarks.cpp new/gqrx-2.17.3/src/qtgui/dockbookmarks.cpp
--- old/gqrx-2.17.2/src/qtgui/dockbookmarks.cpp 2023-10-10 02:47:54.000000000 +0200
+++ new/gqrx-2.17.3/src/qtgui/dockbookmarks.cpp 2023-10-21 04:42:43.000000000 +0200
@@ -158,12 +158,20 @@
bool DockBookmarks::eventFilter(QObject* object, QEvent* event)
{
- if (event->type() == QEvent::KeyPress)
+ // Since Key_Delete can be (is) used as a global shortcut, override the
+ // shortcut. Accepting a ShortcutOverride causes the event to be delivered
+ // again, but as a KeyPress.
+ if (event->type() == QEvent::KeyPress || event->type() == QEvent::ShortcutOverride)
{
QKeyEvent* pKeyEvent = static_cast<QKeyEvent *>(event);
- if (pKeyEvent->key() == Qt::Key_Delete && ui->tableViewFrequencyList->hasFocus())
+ if (pKeyEvent->key() == Qt::Key_Delete)
{
- return DeleteSelectedBookmark();
+ if (event->type() == QEvent::ShortcutOverride) {
+ event->accept();
+ }
+ else {
+ return DeleteSelectedBookmark();
+ }
}
}
return QWidget::eventFilter(object, event);
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package gnuradio for openSUSE:Factory checked in at 2023-10-30 22:10:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnuradio (Old)
and /work/SRC/openSUSE:Factory/.gnuradio.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnuradio"
Mon Oct 30 22:10:24 2023 rev:66 rq:1121031 version:3.10.8.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/gnuradio/gnuradio.changes 2023-07-18 22:08:39.223166558 +0200
+++ /work/SRC/openSUSE:Factory/.gnuradio.new.17445/gnuradio.changes 2023-10-30 22:10:36.947841321 +0100
@@ -1,0 +2,67 @@
+Fri Oct 20 21:32:35 UTC 2023 - Wojciech Kazubski <wk(a)ire.pw.edu.pl>
+
+- Update to version 3.10.8.0
+ * Runtime
+ + Add MAP_FIXED to circular buffer implementations using
+ shm_open() and mmap backed by tmp files.
+ + PMTs can be formatted for logging (format wrapper added).
+ + New io_signature::make() variant replaces makev(), and
+ optionally specifies buffer types.
+ + Fix logging params to be compatible with C++20
+ * GRC
+ + Add "Choose Editor" button to Python block properties. Use
+ the GTK app chooser.
+ + Save choice to the config file.
+ + Correct Python Qt imports in Hier blocks and flowgraph
+ templates.
+ * gr-blocks
+ + Enable building the benchmark testing executable, which runs
+ tests on various math functions.
+ + Repeat block implemented as a basic block (vs sync
+ interpolator) and output buffer allocation fixed.
+ + Add a GRC example for Throttle usage.
+ * gr-digital
+ + Add set_sps() to Symbol Sync.
+ + Header Format: Fix CRC and OFDM formats, add option to
+ header_buffer to read bits lsb first, and refactor
+ extract_bits functions as templates.
+ + Constellation Sink uses different colors for each input by
+ default.
+ + Rework Constellation Soft Decoder, Constellation Object and
+ LDPC Decoder Definition.
+ + Previously, the LDPC Decoder did not work at all. The sigma
+ parameter was removed from the decoder and an optional noise
+ power npwr parameter was added to the constellation.
+ * gr-network
+ + Better support for vectorized output from UDP source. The
+ payload size must still be a multiple of item size * vector
+ size for this to work.
+ * gr-qtgui
+ + Range widget eng_slider and eng modes can now be selected
+ in GRC.
+ + Range widget and a couple of UHD apps now accept values on
+ editingFinished, rather than on returnPressed. Since UIs
+ generated by GRC do not have OK/Apply for such values,
+ there is no "correct" behavior. The behavior is now
+ selectable on the Entry widget.
+ + Frequency Sink startup time improved where sample rate is low
+ * gr-soapy
+ + RTLSDR buffer size may be specified
+ * gr-uhd
+ + RFNoC NullSrcSink block added. The block may be both source
+ and sink.
+ + Add support and examples for RFNoC loopback.
+ + RFNoC Rx Radio adds issue_stream_cmd() and block message
+ handler.
+ * gr-zeromq
+ + Explicitly shutdown and close source/sinks to prevent hangs
+ in some cases.
+ + Require zmq.hpp (cppzmq) version with context_t.shutdown()
+ defined.
+ + If shutdown is not defined, the gr-zeromq is disabled.
+ * Modtool
+ + Add cmake-format support for generated modules
+ * Build system and packaging
+ + Update Read-the-docs config to include build.tools
+
+-------------------------------------------------------------------
Old:
----
gnuradio-3.10.7.0.tar.gz
New:
----
gnuradio-3.10.8.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnuradio.spec ++++++
--- /var/tmp/diff_new_pack.kI8Kvx/_old 2023-10-30 22:10:38.107884117 +0100
+++ /var/tmp/diff_new_pack.kI8Kvx/_new 2023-10-30 22:10:38.123884707 +0100
@@ -16,10 +16,10 @@
#
-%define sover 3_10_7
+%define sover 3_10_8
%bcond_without docs
Name: gnuradio
-Version: 3.10.7.0
+Version: 3.10.8.0
Release: 0
Summary: GNU software radio
License: GPL-3.0-or-later
@@ -231,6 +231,7 @@
%{_datadir}/gnuradio/themes/
%{_datadir}/gnuradio/fec/
%{_datadir}/gnuradio/clang-format.conf
+%{_datadir}/gnuradio/.cmake-format.py
%{_datadir}/icons/hicolor/*/apps/gnuradio-grc.png
%{_datadir}/applications/gnuradio-grc.desktop
%{_datadir}/mime/packages/gnuradio-grc.xml
++++++ gnuradio-3.10.7.0.tar.gz -> gnuradio-3.10.8.0.tar.gz ++++++
++++ 10747 lines of diff (skipped)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-pymediainfo for openSUSE:Factory checked in at 2023-10-30 22:10:22
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-pymediainfo (Old)
and /work/SRC/openSUSE:Factory/.python-pymediainfo.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-pymediainfo"
Mon Oct 30 22:10:22 2023 rev:16 rq:1121026 version:6.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-pymediainfo/python-pymediainfo.changes 2023-08-28 17:13:03.452001847 +0200
+++ /work/SRC/openSUSE:Factory/.python-pymediainfo.new.17445/python-pymediainfo.changes 2023-10-30 22:10:35.779798229 +0100
@@ -1,0 +2,7 @@
+Sun Oct 29 18:22:02 UTC 2023 - Luigi Baldoni <aloisio(a)gmx.com>
+
+- Update to version 6.1.0
+ * Add a buffer_size argument to parse()
+ * Add Python 3.12 support
+
+-------------------------------------------------------------------
Old:
----
pymediainfo-6.0.1.tar.gz
New:
----
pymediainfo-6.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-pymediainfo.spec ++++++
--- /var/tmp/diff_new_pack.RuaRME/_old 2023-10-30 22:10:36.475823907 +0100
+++ /var/tmp/diff_new_pack.RuaRME/_new 2023-10-30 22:10:36.479824054 +0100
@@ -18,7 +18,7 @@
%define skip_python2 1
Name: python-pymediainfo
-Version: 6.0.1
+Version: 6.1.0
Release: 0
Summary: Python wrapper for the mediainfo library
License: MIT
++++++ pymediainfo-6.0.1.tar.gz -> pymediainfo-6.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/PKG-INFO new/pymediainfo-6.1.0/PKG-INFO
--- old/pymediainfo-6.0.1/PKG-INFO 2022-11-26 00:28:43.272776800 +0100
+++ new/pymediainfo-6.1.0/PKG-INFO 2023-10-29 17:15:22.608545500 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pymediainfo
-Version: 6.0.1
+Version: 6.1.0
Summary: A Python wrapper for the mediainfo library.
Home-page: https://github.com/sbraz/pymediainfo
Author: Louis Sautier
@@ -14,6 +14,7 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -25,6 +26,7 @@
Description-Content-Type: text/x-rst; charset=UTF-8
License-File: LICENSE
License-File: AUTHORS
+Requires-Dist: importlib_metadata; python_version < "3.8"
pymediainfo
-----------
@@ -47,6 +49,6 @@
This small package is a wrapper around the MediaInfo library.
-It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.11 and PyPy3.
+It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.12 and PyPy3.
See https://pymediainfo.readthedocs.io/ for more information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/README.rst new/pymediainfo-6.1.0/README.rst
--- old/pymediainfo-6.0.1/README.rst 2022-11-26 00:27:03.000000000 +0100
+++ new/pymediainfo-6.1.0/README.rst 2023-10-29 17:14:01.000000000 +0100
@@ -19,6 +19,6 @@
This small package is a wrapper around the MediaInfo library.
-It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.11 and PyPy3.
+It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.12 and PyPy3.
See https://pymediainfo.readthedocs.io/ for more information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/appveyor.yml new/pymediainfo-6.1.0/appveyor.yml
--- old/pymediainfo-6.0.1/appveyor.yml 2022-11-26 00:27:03.000000000 +0100
+++ new/pymediainfo-6.1.0/appveyor.yml 2023-10-29 17:14:01.000000000 +0100
@@ -1,15 +1,15 @@
environment:
- LINUX_IMAGE: &linux_image Ubuntu2004
+ LINUX_IMAGE: &linux_image Ubuntu2204
MACOS_IMAGE: &macos_image macos-catalina
WINDOWS_IMAGE: &windows_image Visual Studio 2022
- LIBZEN_VERSION: 0.4.39
- MEDIAINFO_VERSION: 22.09
- UBUNTU_VERSION: 20.04
- QA_PYTHON_VERSION: 3.11
- # AppVeyor doesn't offer Python 3.11 on macOS yet
- # https://github.com/appveyor/ci/issues/3858
- DEPLOY_TOXENV: py310
- PYPY_URL: https://downloads.python.org/pypy/pypy3.9-v7.3.9-linux64.tar.bz2
+ LIBZEN_VERSION: 0.4.41
+ MEDIAINFO_VERSION: 23.10
+ UBUNTU_VERSION: 22.04
+ QA_PYTHON_VERSION: 3.12
+ # Python 3.12 is not available everywhere yet, see https://github.com/appveyor/ci/issues/3879
+ # Because of this, we can only deploy on 3.11
+ DEPLOY_TOXENV: py311
+ PYPY_URL: https://downloads.python.org/pypy/pypy3.10-v7.3.13-linux64.tar.bz2
# Work around https://github.com/tox-dev/tox/issues/1550
PYTHONIOENCODING: utf-8
TOX_PARALLEL_NO_SPINNER: 1
@@ -31,12 +31,16 @@
APPVEYOR_BUILD_WORKER_IMAGE: *linux_image
- TOXENV: py311
APPVEYOR_BUILD_WORKER_IMAGE: *linux_image
+ - TOXENV: py312
+ APPVEYOR_BUILD_WORKER_IMAGE: *linux_image
- TOXENV: py38
APPVEYOR_BUILD_WORKER_IMAGE: *macos_image
- TOXENV: py39
APPVEYOR_BUILD_WORKER_IMAGE: *macos_image
- TOXENV: py310
APPVEYOR_BUILD_WORKER_IMAGE: *macos_image
+ - TOXENV: py311
+ APPVEYOR_BUILD_WORKER_IMAGE: *macos_image
- TOXENV: py37
PYTHON: "C:/Python37"
APPVEYOR_BUILD_WORKER_IMAGE: *windows_image
@@ -133,7 +137,7 @@
if [[ $TOXENV == pypy3 ]]; then
pushd /tmp
curl -sS "$PYPY_URL" | tar xj
- PATH="$(pwd)/pypy3.9-v7.3.9-linux64/bin/:$PATH"
+ PATH="$(pwd)/$(basename "$PYPY_URL" | sed -E 's/\.tar\.[^.]+$//')/bin/:$PATH"
python -m ensurepip
popd
else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/docs/conf.py new/pymediainfo-6.1.0/docs/conf.py
--- old/pymediainfo-6.0.1/docs/conf.py 2022-11-26 00:27:03.000000000 +0100
+++ new/pymediainfo-6.1.0/docs/conf.py 2023-10-29 17:14:01.000000000 +0100
@@ -15,6 +15,8 @@
import os
+import setuptools_scm
+
try:
from importlib import metadata
except ImportError:
@@ -57,21 +59,9 @@
copyright = 'Patrick Altman, Louis Sautier'
author = 'Patrick Altman, Louis Sautier'
-# We can't use setuptools_scm's version on Read the Docs because they alter
-# conf.py before running Sphinx, dirtying the repository, which results in
-# an incorrect version being computed.
-# https://github.com/pypa/setuptools_scm/issues/84
-# https://github.com/readthedocs/readthedocs.org/issues/2144
-# Instead, follow setuptools_scm's recommendation and rely on the
-# version of the installed package (which is correct because
-# the repository hasn't been changed prior to installation).
-# https://github.com/pypa/setuptools_scm#usage-from-sphinx
-if os.environ.get("READTHEDOCS") == "True":
- version = metadata.version("pymediainfo")
-else:
- import setuptools_scm
- # fallback_root must be specified for this to work with PyPI tarballs
- version = setuptools_scm.get_version(root="..", fallback_root="..", relative_to=__file__)
+# fallback_root must be specified for this to work with PyPI tarballs
+version = setuptools_scm.get_version(root="..", fallback_root="..", relative_to=__file__)
+
# The full version, including alpha/beta/rc tags.
release = version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/docs/requirements.txt new/pymediainfo-6.1.0/docs/requirements.txt
--- old/pymediainfo-6.0.1/docs/requirements.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/pymediainfo-6.1.0/docs/requirements.txt 2023-10-29 17:14:01.000000000 +0100
@@ -0,0 +1,3 @@
+alabaster
+setuptools_scm
+sphinx
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/pymediainfo/__init__.py new/pymediainfo-6.1.0/pymediainfo/__init__.py
--- old/pymediainfo-6.0.1/pymediainfo/__init__.py 2022-11-26 00:27:03.000000000 +0100
+++ new/pymediainfo-6.1.0/pymediainfo/__init__.py 2023-10-29 17:14:01.000000000 +0100
@@ -363,6 +363,7 @@
legacy_stream_display: bool = False,
mediainfo_options: Optional[Dict[str, str]] = None,
output: Optional[str] = None,
+ buffer_size: Optional[int] = 64 * 1024,
) -> Union[str, "MediaInfo"]:
"""
Analyze a media file using libmediainfo.
@@ -406,6 +407,8 @@
* ``"JSON"``
* ``%``-delimited templates (see ``mediainfo --Info-Parameters``)
+ :param int buffer_size: size of the buffer used to read the file, in bytes. This is only
+ used when `filename` is a file-like object.
:type filename: str or pathlib.Path or os.PathLike or file-like object.
:rtype: str if `output` is set.
:rtype: :class:`MediaInfo` otherwise.
@@ -467,7 +470,7 @@
raise ValueError("File should be opened in binary mode")
lib.MediaInfo_Open_Buffer_Init(handle, file_size, 0)
while True:
- buffer = filename.read(64 * 1024)
+ buffer = filename.read(buffer_size)
if buffer:
# https://github.com/MediaArea/MediaInfoLib/blob/v20.09/Source/MediaInfo/File…
# 4th bit = finished
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/pymediainfo.egg-info/PKG-INFO new/pymediainfo-6.1.0/pymediainfo.egg-info/PKG-INFO
--- old/pymediainfo-6.0.1/pymediainfo.egg-info/PKG-INFO 2022-11-26 00:28:42.000000000 +0100
+++ new/pymediainfo-6.1.0/pymediainfo.egg-info/PKG-INFO 2023-10-29 17:15:22.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: pymediainfo
-Version: 6.0.1
+Version: 6.1.0
Summary: A Python wrapper for the mediainfo library.
Home-page: https://github.com/sbraz/pymediainfo
Author: Louis Sautier
@@ -14,6 +14,7 @@
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
Classifier: Programming Language :: Python :: 3 :: Only
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Programming Language :: Python :: Implementation :: PyPy
@@ -25,6 +26,7 @@
Description-Content-Type: text/x-rst; charset=UTF-8
License-File: LICENSE
License-File: AUTHORS
+Requires-Dist: importlib_metadata; python_version < "3.8"
pymediainfo
-----------
@@ -47,6 +49,6 @@
This small package is a wrapper around the MediaInfo library.
-It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.11 and PyPy3.
+It works on Linux, Mac OS X and Windows and is tested with Python 3.7 to 3.12 and PyPy3.
See https://pymediainfo.readthedocs.io/ for more information.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/pymediainfo.egg-info/SOURCES.txt new/pymediainfo-6.1.0/pymediainfo.egg-info/SOURCES.txt
--- old/pymediainfo-6.0.1/pymediainfo.egg-info/SOURCES.txt 2022-11-26 00:28:43.000000000 +0100
+++ new/pymediainfo-6.1.0/pymediainfo.egg-info/SOURCES.txt 2023-10-29 17:15:22.000000000 +0100
@@ -13,6 +13,7 @@
docs/index.rst
docs/make.bat
docs/pymediainfo.rst
+docs/requirements.txt
pymediainfo/__init__.py
pymediainfo.egg-info/PKG-INFO
pymediainfo.egg-info/SOURCES.txt
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pymediainfo-6.0.1/setup.py new/pymediainfo-6.1.0/setup.py
--- old/pymediainfo-6.0.1/setup.py 2022-11-26 00:27:03.000000000 +0100
+++ new/pymediainfo-6.1.0/setup.py 2023-10-29 17:14:01.000000000 +0100
@@ -62,6 +62,7 @@
"Programming Language :: Python :: 3.9",
"Programming Language :: Python :: 3.10",
"Programming Language :: Python :: 3.11",
+ "Programming Language :: Python :: 3.12",
"Programming Language :: Python :: 3 :: Only",
"Programming Language :: Python :: Implementation :: CPython",
"Programming Language :: Python :: Implementation :: PyPy",
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package rosegarden for openSUSE:Factory checked in at 2023-10-30 22:10:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rosegarden (Old)
and /work/SRC/openSUSE:Factory/.rosegarden.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rosegarden"
Mon Oct 30 22:10:21 2023 rev:47 rq:1121014 version:23.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/rosegarden/rosegarden.changes 2023-04-19 17:42:41.864096190 +0200
+++ /work/SRC/openSUSE:Factory/.rosegarden.new.17445/rosegarden.changes 2023-10-30 22:10:32.795688140 +0100
@@ -1,0 +2,46 @@
+Sun Oct 29 16:07:50 UTC 2023 - Dirk Müller <dmueller(a)suse.com>
+
+- update to 23.06:
+ * Fix crash related to static initialization order.
+ * Fix bug #1047, beaming groups erroneous after merging notes.
+ * Fix offset selection rectangle in Notation. Bug #1444.
+ * Fix time column widths in the Event Editor so that they don't
+ need resizing on every launch.
+ * Event filter dialog improvements and fixes.
+ * Fix broken retrograde commands.
+ * Lilypond: Fix volta/alternatives and lyrics.
+ * Lilypond: Fix vertical alignment of verses. Bug #1650.
+ * Lilypond: Fix the printing of supplementary verses.
+ * Lilypond: Fix multiple lyrics verses with repetition.
+ * Lilypond: Fix the removing of an underscore at the end of a
+ bar of lyrics.
+ * Lilypond: Fix printing of verses is now working when voltas
+ are unfolded. [2eae089]
+ * Lilypond: Fix bar number of verses in exported LilyPond
+ files.
+ * Fix timer preference coming up empty for selections after
+ "HR timer". [08748a6]
+ * Fix paste problems in notation editor. Bug #1651. [457f3de]
+ * Fix the LilyPond exporter autotest and update the baseline.
+ * Fix crash in LilyPond exporter. Bug #1640. [a49712d]
+ * Fix potential crash in the grid quantizer. [4bdefd9]
+ * Fix quantizer crash. Bug #1654. [56ca66c, a8e669d]
+ * LilyPond: Fix a small bug related to numbers in the lyrics.
+ * LilyPond: Fix for lyrics containing some special characters.
+ * LilyPond: Fix the rendering of dash and underscore.
+ * Fix missing parameter patterns in the Set Event Velocities
+ dialog.
+ * Matrix: Fix deleting too many notes with ruler present. Bug
+ * File > Merge dialogs now allow merging of multiple files.
+ * View > Full Screen (F11) added to main window. [a09103c]
+ * Removed LEDs from archived tracks to make archived tracks
+ easier to identify. [a5f4131]
+ * Matrix and Notation now offer snap to grid in the control
+ rulers.
+ * Add Ctrl+L shortcut for loop toggle. Feature request #398.
+ * Add new LilyPond versions. [6c7f0ef]
+ * Add "Remove notes smaller than X" field to grid quantizer.
+ * Add "Remove articulations" to grid quantizer. Feature
+ request
+
+-------------------------------------------------------------------
Old:
----
rosegarden-22.12.1.tar.gz
New:
----
rosegarden-23.06.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rosegarden.spec ++++++
--- /var/tmp/diff_new_pack.5MWtdY/_old 2023-10-30 22:10:34.883765173 +0100
+++ /var/tmp/diff_new_pack.5MWtdY/_new 2023-10-30 22:10:34.883765173 +0100
@@ -19,7 +19,7 @@
%define vers 22.12
Name: rosegarden
-Version: 22.12.1
+Version: 23.06
Release: 0
License: GPL-2.0-or-later
Summary: Midi, Audio And Notation Editor
++++++ rosegarden-22.12.1.tar.gz -> rosegarden-23.06.tar.gz ++++++
/work/SRC/openSUSE:Factory/rosegarden/rosegarden-22.12.1.tar.gz /work/SRC/openSUSE:Factory/.rosegarden.new.17445/rosegarden-23.06.tar.gz differ: char 12, line 1
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package qpwgraph for openSUSE:Factory checked in at 2023-10-30 22:10:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/qpwgraph (Old)
and /work/SRC/openSUSE:Factory/.qpwgraph.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qpwgraph"
Mon Oct 30 22:10:19 2023 rev:19 rq:1121013 version:0.5.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/qpwgraph/qpwgraph.changes 2023-07-26 13:25:02.756398697 +0200
+++ /work/SRC/openSUSE:Factory/.qpwgraph.new.17445/qpwgraph.changes 2023-10-30 22:10:31.595643869 +0100
@@ -1,0 +2,13 @@
+Sun Oct 29 16:06:59 UTC 2023 - Dirk Müller <dmueller(a)suse.com>
+
+- update to 0.5.3:
+ * Added user contributed documentation: How To Use The
+ Patchbay.
+ * Fix condition for saving node name aliases.
+ * Ctrl+left or middle-button click-dragging for panning, is now
+ a lot smoother, hopefully.
+ * Click-dragging with the mouse middle-button is for panning
+ only, not to start a selection anymore.
+ * Add Ctrl+Q to Quit action
+
+-------------------------------------------------------------------
Old:
----
qpwgraph-v0.5.1.tar.bz2
New:
----
qpwgraph-v0.5.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qpwgraph.spec ++++++
--- /var/tmp/diff_new_pack.s8rTKZ/_old 2023-10-30 22:10:32.231667332 +0100
+++ /var/tmp/diff_new_pack.s8rTKZ/_new 2023-10-30 22:10:32.231667332 +0100
@@ -17,7 +17,7 @@
Name: qpwgraph
-Version: 0.5.1
+Version: 0.5.3
Release: 0
Summary: PipeWire Graph Qt GUI Interface
License: GPL-2.0-or-later
++++++ qpwgraph-v0.5.1.tar.bz2 -> qpwgraph-v0.5.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/CMakeLists.txt new/qpwgraph-v0.5.3/CMakeLists.txt
--- old/qpwgraph-v0.5.1/CMakeLists.txt 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/CMakeLists.txt 2023-09-08 11:02:03.000000000 +0200
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.15)
project(qpwgraph
- VERSION 0.5.1
+ VERSION 0.5.3
DESCRIPTION "A PipeWire Graph Qt GUI Interface"
HOMEPAGE_URL "https://gitlab.freedesktop.org/rncbc/qpwgraph"
LANGUAGES C CXX)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/ChangeLog new/qpwgraph-v0.5.3/ChangeLog
--- old/qpwgraph-v0.5.1/ChangeLog 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/ChangeLog 2023-09-08 11:02:03.000000000 +0200
@@ -2,6 +2,21 @@
--------------------------------------------
+0.5.3 2023-09-08 An end-of-summer'23 release.
+
+- Added user contributed documentation: How To Use The Patchbay.
+- Fix condition for saving node name aliases.
+
+
+0.5.2 2023-08-05 A high-summer'23 release.
+
+- Ctrl+left or middle-button click-dragging for panning, is now a
+ lot smoother, hopefully.
+- Click-dragging with the mouse middle-button is for panning only,
+ not to start a selection anymore.
+- Add Ctrl+Q to Quit action
+
+
0.5.1 2023-07-17 A summer'23 hot-fix release.
- Fixed segfault on initialization that was affecting Qt5 builds.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/README.md new/qpwgraph-v0.5.3/README.md
--- old/qpwgraph-v0.5.1/README.md 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/README.md 2023-09-08 11:02:03.000000000 +0200
@@ -1,6 +1,6 @@
# qpwgraph - A PipeWire Graph Qt GUI Interface
-
+
**qpwgraph** is a graph manager dedicated to [PipeWire](https://pipewire.org),
using the [Qt C++ framework](https://qt.io), based and pretty much like the
@@ -44,13 +44,17 @@
Enjoy.
+## Documentation
+
+ [How To Use The Patchbay](docs/qpwgraph_patchbay-user_manual.md)
+
## License
**qpwgraph** is free, open-source software, distributed under the terms of
the GNU General Public License ([GPL](https://www.gnu.org/copyleft/gpl.html))
version 2 or later.
-
## Copyright
Copyright (C) 2021-2023, rncbc aka Rui Nuno Capela. All rights reserved.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/debian/changelog new/qpwgraph-v0.5.3/debian/changelog
--- old/qpwgraph-v0.5.1/debian/changelog 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/debian/changelog 2023-09-08 11:02:03.000000000 +0200
@@ -1,3 +1,15 @@
+qpwgraph (0.5.3-31.1) unstable; urgency=low
+
+ * A end-of-summer'23 release.
+
+ -- Rui Nuno Capela <rncbc(a)rncbc.org> Fri, 8 Sep 2023 18:00:00 +0100
+
+qpwgraph (0.5.2-30.1) unstable; urgency=low
+
+ * A high-summer'23 release.
+
+ -- Rui Nuno Capela <rncbc(a)rncbc.org> Sat, 5 Aug 2023 16:00:00 +0100
+
qpwgraph (0.5.1-29.1) unstable; urgency=low
* A summer'23 hot-fix release.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/debian/control new/qpwgraph-v0.5.3/debian/control
--- old/qpwgraph-v0.5.1/debian/control 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/debian/control 2023-09-08 11:02:03.000000000 +0200
@@ -1,6 +1,6 @@
Source: qpwgraph
-Section: contrib/sound
-Priority: extra
+Section: sound
+Priority: optional
Maintainer: Rui Nuno Capela <rncbc(a)rncbc.org>
Build-Depends: debhelper (>= 11), cmake, pkg-config,
build-essential, g++ (>= 8), g++-11 | g++-10 | g++-9 | g++-8,
@@ -9,9 +9,11 @@
qt6-tools-dev (>= 6.1) | qttools5-dev (>= 5.1),
qt6-tools-dev-tools (>= 6.1) | qttools5-dev-tools (>= 5.1),
qt6-l10n-tools (>= 6.1) | base-files (<< 12),
- qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev, libgl-dev,
+ qt6-svg-dev | libqt6svg6-dev | libqt5svg5-dev,
+ libxkbcommon-dev, libgl-dev,
libasound2-dev, libpipewire-0.3-dev
-Standards-Version: 3.9.7
+Standards-Version: 4.6.2
+Rules-Requires-Root: no
Package: qpwgraph
Architecture: any
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/debian/copyright new/qpwgraph-v0.5.3/debian/copyright
--- old/qpwgraph-v0.5.1/debian/copyright 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/debian/copyright 2023-09-08 11:02:03.000000000 +0200
@@ -1,33 +1,28 @@
-This package was debianized by Rui Nuno Capela <rncbc(a)rncbc.org> on
-Mon, 6 Dec 2021 20:00:00 +0000.
-
-It was downloaded from https://gitlab.freedesktop.org/rncbc/qpwgraph
-
-Upstream Author: Rui Nuno Capela <rncbc(a)rncbc.org>
-
-Copyright:
-
- Copyright (C) 2021-2023, rncbc aka Rui Nuno Capela. All rights reserved.
-
-License:
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2021-2023, Rui Nuno Capela <rncbc(a)rncbc.org> and
-is licensed under the GPL, see above.
-
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: qpwgraph
+Upstream-Contact: Rui Nuno Capela <rncbc(a)rncbc.org>
+Source: https://gitlab.freedesktop.org/rncbc/qpwgraph
+
+Files: *
+Copyright: 2021-2023 Rui Nuno Capela <rncbc(a)rncbc.org>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or (at
+ your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU General Public
+ License can be found in /usr/share/common-licenses/GPL-2.
+
+Files: src/appdata/*
+Copyright: 2021-2023 Rui Nuno Capela <rncbc(a)rncbc.org>
+License: FSFAP
+ Copying and distribution of this file, with or without modification,
+ are permitted in any medium without royalty provided the copyright
+ notice and this notice are preserved. This file is offered as-is,
+ without any warranty.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/debian/docs new/qpwgraph-v0.5.3/debian/docs
--- old/qpwgraph-v0.5.1/debian/docs 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/debian/docs 2023-09-08 11:02:03.000000000 +0200
@@ -1,3 +1,2 @@
README.md
-LICENSE.md
ChangeLog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/docs/qpwgraph_patchbay-user_manual.md new/qpwgraph-v0.5.3/docs/qpwgraph_patchbay-user_manual.md
--- old/qpwgraph-v0.5.1/docs/qpwgraph_patchbay-user_manual.md 1970-01-01 01:00:00.000000000 +0100
+++ new/qpwgraph-v0.5.3/docs/qpwgraph_patchbay-user_manual.md 2023-09-08 11:02:03.000000000 +0200
@@ -0,0 +1,31 @@
+# How To Use The Patchbay 
+
+Once a connection patchbay established, it is possible to store those connections in a patchbay configuration that can be then restored when loaded back.
+
+## *Activated* button 
+
+The *Activated* button is simply to activate or not the loaded patchbay. The patchbay must be activated in order to access all the other functionalities.
+
+If checked, connections stored in the loaded patchbay will be restored. All other connections will stay as they were before the load of the patchbay. If unchecked, no connection change at all.
+
+## *Exclusive* button 
+
+The *Exclusive* button goal it to determine if the connections stored in the loaded and activated patchbay will be the only active connections or if previous connections are allowed.
+
+If checked, connections not stored in the loaded and activated patchbay will be removed. If unchecked, the loaded and activated patchbay will only create the stored connections.
+
+## *Edit* button 
+
+If checked, the buttons *Pin* and *Unpin* are available. Those functions are only for connections, so at least one connection (line between an input and an output) has to be selected.
+
+### *Pin* button 
+
+Makes the connection persistant in the currently loaded and activated patchbay.
+
+### *Unpin* button 
+
+Used to make the connection temporary. The unpinned connection will disappear forever if another patchbay is loaded.
+
+
+---
+Credits: @Lootre (a.k.a. Thomas Lachat).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/rpm/qpwgraph.spec new/qpwgraph-v0.5.3/rpm/qpwgraph.spec
--- old/qpwgraph-v0.5.1/rpm/qpwgraph.spec 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/rpm/qpwgraph.spec 2023-09-08 11:02:03.000000000 +0200
@@ -16,8 +16,8 @@
#
%define name qpwgraph
-%define version 0.5.1
-%define release 29.1
+%define version 0.5.3
+%define release 31.1
%define _prefix /usr
@@ -141,6 +141,10 @@
%changelog
+* Fri Sep 8 2023 Rui Nuno Capela <rncbc(a)rncbc.org> 0.5.3
+- An end-of-summer'23 release.
+* Sat Aug 5 2023 Rui Nuno Capela <rncbc(a)rncbc.org> 0.5.2
+- A high-summer'23 release.
* Mon Jul 17 2023 Rui Nuno Capela <rncbc(a)rncbc.org> 0.5.1
- A summer'23 hot-fix release.
* Sun Jul 16 2023 Rui Nuno Capela <rncbc(a)rncbc.org> 0.5.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/appdata/org.rncbc.qpwgraph.metainfo.xml new/qpwgraph-v0.5.3/src/appdata/org.rncbc.qpwgraph.metainfo.xml
--- old/qpwgraph-v0.5.1/src/appdata/org.rncbc.qpwgraph.metainfo.xml 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/appdata/org.rncbc.qpwgraph.metainfo.xml 2023-09-08 11:02:03.000000000 +0200
@@ -7,9 +7,9 @@
<name>qpwgraph</name>
<summary>A PipeWire Graph Qt GUI Interface</summary>
<description>
- <p>qpwgraph is a graph manager dedicated to PipeWire (https://pipewire.org)
- using the Qt C++ framework (https://qt.io) based and pretty much like the
- same of QjackCtl (https://qjackctl.sourceforge.io)</p>
+ <p>qpwgraph is a graph manager dedicated to PipeWire (https\://pipewire.org),
+ using the Qt C++ framework (https\://qt.io), based and pretty much like the
+ same of QjackCtl (https\://qjackctl.sourceforge.io).</p>
</description>
<launchable type="desktop-id">org.rncbc.qpwgraph.desktop</launchable>
<provides>
@@ -18,11 +18,11 @@
<screenshots>
<screenshot type="default">
<image>https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/src/images/qpwgrap…</image>
- <caption>The main screenshot showing the application in action</caption>
+ <caption>The main application window in action</caption>
</screenshot>
<screenshot>
<image>https://gitlab.freedesktop.org/rncbc/qpwgraph/-/raw/main/src/images/qpwgrap…</image>
- <caption>The official system tray icon showing the application in action</caption>
+ <caption>The official system tray icon</caption>
</screenshot>
</screenshots>
<keywords>
@@ -37,7 +37,7 @@
<developer_name>rncbc aka. Rui Nuno Capela</developer_name>
<update_contact>rncbc(a)rncbc.org</update_contact>
<releases>
- <release version="0.5.1" date="2023-07-17" urgency="low" />
+ <release version="0.5.3" date="2023-09-08" urgency="low" />
</releases>
<content_rating type="oars-1.0"/>
</component>
Binary files old/qpwgraph-v0.5.1/src/images/qpwgraph_screenshot-1.png and new/qpwgraph-v0.5.3/src/images/qpwgraph_screenshot-1.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/qpwgraph.cpp new/qpwgraph-v0.5.3/src/qpwgraph.cpp
--- old/qpwgraph-v0.5.1/src/qpwgraph.cpp 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/qpwgraph.cpp 2023-09-08 11:02:03.000000000 +0200
@@ -149,19 +149,13 @@
#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
const QNativeIpcKey native_key
= QSharedMemory::legacyNativeKey(m_unique);
-#endif
-#if defined(Q_OS_UNIX)
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
m_memory = new QSharedMemory(native_key);
#else
+#if defined(Q_OS_UNIX)
m_memory = new QSharedMemory(m_unique);
-#endif
m_memory->attach();
delete m_memory;
#endif
-#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0)
- m_memory = new QSharedMemory(native_key);
-#else
m_memory = new QSharedMemory(m_unique);
#endif
bool is_server = false;
@@ -233,8 +227,7 @@
form->apply_args(this);
// Just make it always shows up fine...
if (m_widget && !m_start_minimized) {
- m_widget->hide();
- m_widget->show();
+ m_widget->showNormal();
m_widget->raise();
m_widget->activateWindow();
}
@@ -255,11 +248,6 @@
#if defined(Q_OS_LINUX) && !defined(CONFIG_WAYLAND)
::setenv("QT_QPA_PLATFORM", "xcb", 0);
#endif
-#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
- QGuiApplication::setHighDpiScaleFactorRoundingPolicy(
- Qt::HighDpiScaleFactorRoundingPolicy::RoundPreferFloor);
-#endif
-
qpwgraph_application app(argc, argv);
if (!app.parse_args(app.arguments())) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/qpwgraph_canvas.cpp new/qpwgraph-v0.5.3/src/qpwgraph_canvas.cpp
--- old/qpwgraph-v0.5.1/src/qpwgraph_canvas.cpp 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/qpwgraph_canvas.cpp 2023-09-08 11:02:03.000000000 +0200
@@ -612,20 +612,32 @@
m_item = nullptr;
m_pos = QGraphicsView::mapToScene(event->pos());
- qpwgraph_item *item = itemAt(m_pos);
- if (item && item->type() >= QGraphicsItem::UserType)
- m_item = static_cast<qpwgraph_item *> (item);
-
- if (event->button() == Qt::LeftButton ||
- event->button() == Qt::MiddleButton)
+ if (event->button() == Qt::LeftButton) {
+ m_item = itemAt(m_pos);
m_state = DragStart;
+ }
- if (m_state == DragStart && m_item == nullptr
+ if (m_item == nullptr
&& (((event->button() == Qt::LeftButton)
&& (event->modifiers() & Qt::ControlModifier))
|| (event->button() == Qt::MiddleButton))
&& m_scene->selectedItems().isEmpty()) {
- QGraphicsView::setCursor(Qt::ClosedHandCursor);
+ #if 1//NEW_DRAG_SCROLL_MODE
+ // HACK: When about to drag-scroll,
+ // always fake a left-button press...
+ QGraphicsView::setDragMode(ScrollHandDrag);
+ QMouseEvent event2(event->type(),
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 1, 0)
+ event->position(), event->globalPosition(),
+ #else
+ event->localPos(), event->globalPos(),
+ #endif
+ Qt::LeftButton, Qt::LeftButton,
+ event->modifiers() | Qt::ControlModifier);
+ QGraphicsView::mousePressEvent(&event2);
+ #else
+ QGraphicsView::setCursor(Qt::ClosedHandCursor)
+ #endif
m_state = DragScroll;
}
}
@@ -774,12 +786,16 @@
}
break;
case DragScroll: {
+ #if 1//NEW_DRAG_SCROLL_MODE
+ QGraphicsView::mouseMoveEvent(event);
+ #else
QScrollBar *hbar = QGraphicsView::horizontalScrollBar();
QScrollBar *vbar = QGraphicsView::verticalScrollBar();
const QPoint delta = (pos - m_pos).toPoint();
hbar->setValue(hbar->value() - delta.x());
vbar->setValue(vbar->value() - delta.y());
m_pos = pos;
+ #endif
break;
}
default:
@@ -893,6 +909,12 @@
break;
}
+#if 1//NEW_DRAG_SCROLL_MODE
+ if (QGraphicsView::dragMode() == ScrollHandDrag) {
+ QGraphicsView::mouseReleaseEvent(event);
+ QGraphicsView::setDragMode(NoDrag);
+ }
+#endif
m_state = DragNone;
m_item = nullptr;
@@ -1406,7 +1428,7 @@
m_settings->setValue('/' + node_key, node->pos());
m_settings->endGroup();
m_settings->beginGroup(NodeAliasesGroup);
- if (node->nodeName() != node->nodeTitle())
+ if (node->nodeNameLabel() != node->nodeTitle())
m_settings->setValue('/' + node_key, node->nodeTitle());
else
m_settings->remove('/' + node_key);
@@ -1420,7 +1442,7 @@
if (port) {
const QString& port_key = portKey(port);
m_settings->beginGroup(PortAliasesGroup);
- if (port && port->portName() != port->portTitle())
+ if (port && port->portNameLabel() != port->portTitle())
m_settings->setValue('/' + port_key, port->portTitle());
else
m_settings->remove('/' + port_key);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/qpwgraph_canvas.h new/qpwgraph-v0.5.3/src/qpwgraph_canvas.h
--- old/qpwgraph-v0.5.1/src/qpwgraph_canvas.h 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/qpwgraph_canvas.h 2023-09-08 11:02:03.000000000 +0200
@@ -50,7 +50,7 @@
// Define if cleanup of legacy node names is needed (v0.5.0)...
-#define CONFIG_CLEANUP_NODE_NAMES 1
+#undef CONFIG_CLEANUP_NODE_NAMES
//----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/qpwgraph_form.ui new/qpwgraph-v0.5.3/src/qpwgraph_form.ui
--- old/qpwgraph-v0.5.1/src/qpwgraph_form.ui 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/qpwgraph_form.ui 2023-09-08 11:02:03.000000000 +0200
@@ -495,7 +495,7 @@
<string>Quit this application program</string>
</property>
<property name="shortcut">
- <string/>
+ <string>Ctrl+Q</string>
</property>
</action>
<action name="editSelectAllAction">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qpwgraph-v0.5.1/src/qpwgraph_port.cpp new/qpwgraph-v0.5.3/src/qpwgraph_port.cpp
--- old/qpwgraph-v0.5.1/src/qpwgraph_port.cpp 2023-07-17 11:59:55.000000000 +0200
+++ new/qpwgraph-v0.5.3/src/qpwgraph_port.cpp 2023-09-08 11:02:03.000000000 +0200
@@ -168,9 +168,10 @@
void qpwgraph_port::setPortTitle ( const QString& title )
{
- QGraphicsPathItem::setToolTip(portNameLabel());
+ const QString& name_label = portNameLabel();
+ QGraphicsPathItem::setToolTip(name_label);
- m_title = (title.isEmpty() ? m_name : title);
+ m_title = (title.isEmpty() ? name_label : title);
static const int MAX_TITLE_LENGTH = 29;
static const QString ellipsis(3, '.');
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package spyder for openSUSE:Factory checked in at 2023-10-30 22:10:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spyder (Old)
and /work/SRC/openSUSE:Factory/.spyder.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spyder"
Mon Oct 30 22:10:17 2023 rev:49 rq:1121004 version:5.4.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/spyder/spyder.changes 2023-09-25 20:03:45.119347642 +0200
+++ /work/SRC/openSUSE:Factory/.spyder.new.17445/spyder.changes 2023-10-30 22:10:30.447601515 +0100
@@ -1,0 +2,6 @@
+Sun Oct 29 13:26:43 UTC 2023 - Ben Greiner <code(a)bnavigator.de>
+
+- Raise pylint upper pin (requires update to python-lsp-server)
+ * Add spyder-pr21470-pylint3.diff
+
+-------------------------------------------------------------------
New:
----
spyder-pr21470-pylint3.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spyder.spec ++++++
--- /var/tmp/diff_new_pack.m38iAG/_old 2023-10-30 22:10:31.163627930 +0100
+++ /var/tmp/diff_new_pack.m38iAG/_new 2023-10-30 22:10:31.163627930 +0100
@@ -29,6 +29,7 @@
URL: https://www.spyder-ide.org/
Source: https://github.com/spyder-ide/spyder/archive/v%{version}.tar.gz#/spyder-%{v…
Source1: spyder-rpmlintrc
+Patch0: spyder-pr21470-pylint3.diff
BuildRequires: fdupes
BuildRequires: python-rpm-macros
BuildRequires: python3-base >= 3.7
@@ -81,9 +82,9 @@
Requires: python3-whatthepatch
Requires: python3-yapf
Requires: (python3-QDarkStyle >= 3.0.2 with python3-QDarkStyle < 3.2.0)
-Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3)
+Requires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1)
Requires: (python3-python-lsp-black >= 1.2.0 with python3-python-lsp-black < 3)
-Requires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.8)
+Requires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.9)
Requires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5.0)
Requires: (python3-spyder-kernels >= 2.4.4 with python3-spyder-kernels < 2.5)
Recommends: %{name}-dicom
@@ -178,8 +179,8 @@
BuildRequires: (python3-ipython >= 7.31.1 with python3-ipython < 9)
BuildRequires: (python3-python-lsp-black >= 1.2.0 with python3-python-lsp-black < 3)
BuildConflicts: (python3-ipython >= 8.8 with python3-ipython < 8.10.1)
-BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3)
-BuildRequires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.8)
+BuildRequires: (python3-pylint >= 2.5.0 with python3-pylint < 3.1)
+BuildRequires: (python3-python-lsp-server >= 1.7.4 with python3-python-lsp-server < 1.9)
BuildRequires: (python3-qtconsole >= 5.4.2 with python3-qtconsole < 5.5)
BuildRequires: (python3-spyder-kernels >= 2.4.4 with python3-spyder-kernels < 2.5)
# /SECTION
@@ -264,7 +265,9 @@
-e 's/(pyqt.*)<5.16/\1/' \
-e 's/(jedi.*)<0.19/\1<0.20/' \
-i setup.py requirements/main.yml binder/environment.yml
-sed -i '/JEDI/ s/0.19/0.20/' spyder/dependencies.py
+sed \
+ -e '/JEDI_REQVER/ s/<0.19/<0.20/' \
+ -i spyder/dependencies.py
# Upstream brings its fixed versions for pyls, qdarksstyle and spyder-kernels for its
# test environment, but we want to test against installed packages.
++++++ spyder-pr21470-pylint3.diff ++++++
Index: spyder-5.4.5/spyder/dependencies.py
===================================================================
--- spyder-5.4.5.orig/spyder/dependencies.py
+++ spyder-5.4.5/spyder/dependencies.py
@@ -52,9 +52,9 @@ PEXPECT_REQVER = '>=4.4.0'
PICKLESHARE_REQVER = '>=0.4'
PSUTIL_REQVER = '>=5.3'
PYGMENTS_REQVER = '>=2.0'
-PYLINT_REQVER = '>=2.5.0,<3.0'
+PYLINT_REQVER = '>=2.5.0,<3.1'
PYLINT_VENV_REQVER = '>=3.0.2'
-PYLSP_REQVER = '>=1.7.4,<1.8.0'
+PYLSP_REQVER = '>=1.7.4,<1.9.0'
PYLSP_BLACK_REQVER = '>=1.2.0,<3.0.0'
PYLS_SPYDER_REQVER = '>=0.4.0'
PYXDG_REQVER = '>=0.26'
Index: spyder-5.4.5/spyder/plugins/pylint/utils.py
===================================================================
--- spyder-5.4.5.orig/spyder/plugins/pylint/utils.py
+++ spyder-5.4.5/spyder/plugins/pylint/utils.py
@@ -24,7 +24,9 @@ except Exception:
def _find_pylintrc_path(path):
if pylint_config is not None:
os.chdir(path)
- return pylint_config.find_pylintrc()
+ for p in pylint_config.find_default_config_files():
+ # return the first config found as str
+ return str(p)
def get_pylintrc_path(search_paths=None, home_path=None):
Index: spyder-5.4.5/binder/environment.yml
===================================================================
--- spyder-5.4.5.orig/binder/environment.yml
+++ spyder-5.4.5/binder/environment.yml
@@ -25,13 +25,13 @@ dependencies:
- pickleshare >=0.4
- psutil >=5.3
- pygments >=2.0
-- pylint >=2.5.0,<3.0
+- pylint >=2.5.0,<3.1
- pylint-venv >=3.0.2
- pyls-spyder >=0.4.0
- pyqt <5.16
- pyqtwebengine <5.16
- python-lsp-black >=1.2.0,<3.0.0
-- python-lsp-server >=1.7.4,<1.8.0
+- python-lsp-server >=1.7.4,<1.9.0
- pyxdg >=0.26
- pyzmq >=22.1.0
- qdarkstyle >=3.0.2,<3.2.0
Index: spyder-5.4.5/setup.py
===================================================================
--- spyder-5.4.5.orig/setup.py
+++ spyder-5.4.5/setup.py
@@ -223,13 +223,13 @@ install_requires = [
'pickleshare>=0.4',
'psutil>=5.3',
'pygments>=2.0',
- 'pylint>=2.5.0,<3.0',
+ 'pylint>=2.5.0,<3.1',
'pylint-venv>=3.0.2',
'python-lsp-black>=1.2.0,<3.0.0',
'pyls-spyder>=0.4.0',
'pyqt5<5.16',
'pyqtwebengine<5.16',
- 'python-lsp-server[all]>=1.7.4,<1.8.0',
+ 'python-lsp-server[all]>=1.7.4,<1.9.0',
'pyxdg>=0.26;platform_system=="Linux"',
'pyzmq>=22.1.0',
'qdarkstyle>=3.0.2,<3.2.0',
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package pgadmin4 for openSUSE:Factory checked in at 2023-10-30 22:10:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pgadmin4 (Old)
and /work/SRC/openSUSE:Factory/.pgadmin4.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pgadmin4"
Mon Oct 30 22:10:11 2023 rev:23 rq:1121161 version:7.8
Changes:
--------
--- /work/SRC/openSUSE:Factory/pgadmin4/pgadmin4.changes 2023-08-28 17:14:16.858637868 +0200
+++ /work/SRC/openSUSE:Factory/.pgadmin4.new.17445/pgadmin4.changes 2023-10-30 22:10:24.119368055 +0100
@@ -1,0 +2,127 @@
+Mon Oct 30 11:23:57 UTC 2023 - Antonio Larrosa <alarrosa(a)suse.com>
+
+- Add obsoletes: pgadmin4-web
+
+-------------------------------------------------------------------
+Wed Oct 25 06:26:07 UTC 2023 - Antonio Larrosa <alarrosa(a)suse.com>
+
+- Add a vendor.tar.xz source package with node modules that have to
+ be downloaded in the developer workstation since otherwise they
+ won't be able to get downloaded in the build service.
+- Add an update-vendor.sh script that updates (actually, recreates)
+ the vendor.tar.xz package. This should be run manually with each
+ package update.
+- Remove obsoleted file pgadmin4.qt.conf.in which hasn't been used
+ at all for some time.
+- Add patch to set the environment variable EVENTLET_NO_GREENDNS
+ which fixes pgadmin4 to build successfully with eventlet 0.33.3,
+ httpcore 0.17.1 and httpx 0.24.0:
+ * fix-eventlet-select_epoll.patch
+- Merged pgadmin4-web subpackage into the main pgadmin4 package
+ which now installs the pgAdmin4 server.
+- Create new pgadmin4-desktop subpackage that includes a very small
+ python script I wrote that starts the pgadmin4 server in runtime
+ mode (as a regular user) and provides a system tray icon so users
+ can open new windows and quit the server with a UI since the
+ alternative (using the official pgAdmin4 runtime application
+ would require providing a full node.js modules tree and using
+ NW.js for the ui).
+- Fix .desktop file which was now moved to the pgadmin4-desktop
+ subpackage. The "Encoding" key is deprecated so it has been
+ removed, only one main category is now used in the Categories
+ key and the path to the icon was fixed.
+- Remove pgadmin4.qt.conf.in which is not used anymore
+
+-------------------------------------------------------------------
+Wed Oct 25 06:24:15 UTC 2023 - Antonio Larrosa <alarrosa(a)suse.com>
+
+- Update to 7.8
+ * Supported Database Servers
+ - PostgreSQL: 12, 13, 14, 15, and 16
+ - EDB Advanced Server: 12, 13, 14 and 15
+ * Bundled PostgreSQL Utilities
+ - psql, pg_dump, pg_dumpall, pg_restore: 16.0
+ * New features
+ - Add support for foreign table's new functionality for PG 11
+ and above.
+ - Allow setting custom username for shared servers, with
+ default as username of server being shared.
+ - Add 'GENERATED ALWAYS AS..' option while creating column
+ constraints for Foreign Table.
+ - GUI representation of the system's activity using the
+ 'system_stats' extension.
+ - Added 'load_balance_hosts' connection string parameter
+ for PG 16 and above.
+ * Housekeeping
+ - Use PG16 as the default PostgreSQL version.
+ * Bug fixes
+ - Fixed an issue in ERD tool where the downloaded images
+ have a few links cut.
+ - Fixed an issue where user was not able to assign new/old
+ columns as primary key once column with primary key is
+ deleted.
+ - Add support for setting prepare threshold in server
+ connection.
+ - Fixed an issue where the wrong message "Current database
+ has been moved or renamed" is displayed when debugging any
+ function.
+ - Fixed an issue where Processes tab displays wrong server
+ name in some scenario.
+ - Fix an issue where global/native keyboard shortcuts are
+ not working when any cell of data output grid has focus.
+ - Fixed query history slowness issue by storing query only for
+ those having certain threshold max length.
+ - Fix an issue where foreign table column name becomes "none"
+ if the user changes any column data type.
+ - Pin the cryptography version to fix PyO3 modules
+ initialisation error.
+ - Ensure that the backup works properly for PG 16 on the latest
+ docker image.
+ - Fixed an issue where the user is unable to select objects on
+ the backup dialog due to tree flickering.
+ - Fixed an issue where non-super PostgreSQL users are not able
+ to terminate their own connections from dashboard.
+ - Fix an issue where scale in columns is not allowed to have
+ value as 0 or below.
+ - Fix an issue in graphical explain plan where query tool
+ crashes when the plan has parallel workers details and sort
+ node is clicked for details.
+ - Fix an issue where user login is not working if
+ username/email contains single quote in server mode.
+
+- Update to 7.7
+ * Supported Database Servers
+ - PostgreSQL: 11, 12, 13, 14 and 15
+ - EDB Advanced Server: 11, 12, 13, 14 and 15
+ * Bundled PostgreSQL Utilities
+ - psql, pg_dump, pg_dumpall, pg_restore: 15.4
+ * New features
+ - Added support to select/deselect objects in the Backup
+ dialog.
+ - Added all the new options of the 'WITH' clause in the
+ subscription dialog.
+ - Added USING method while creating the table.
+ - Added compression method option while creating a column.
+ - Added Strategy, Locale Provider, ICU Locale, ICU Rules,
+ and OID options while creating a database.
+ - Added USING method while creating the materialized view.
+ - Add support for additional ID token claim checks for
+ OAuth 2 authentication.
+ * Housekeeping
+ - Added the ‘data type’ column in the properties tab of
+ the Columns collection node.
+ * Bug fixes
+ - Fix an issue where user is not able to change the
+ password when SMTP is not configured.
+ - Ensure user is redirected to login page after failed login.
+ - Ensure that Materialized view size fields in "Statistics"
+ should be human-readable.
+ - Fix an issue where changing the password shows success but
+ the new password is not working.
+ - Fix an issue where login form doesn't appear if internal
+ auth source is removed.
+ - Fix a security related issue where an authenticated user can
+ run remote command using validate binary path API
+ (CVE-2023-5002, boo#1215603).
+
+-------------------------------------------------------------------
Old:
----
pgadmin4-7.6.tar.gz
pgadmin4-7.6.tar.gz.asc
pgadmin4.desktop.in
pgadmin4.qt.conf.in
New:
----
fix-eventlet-select_epoll.patch
pgadmin4-7.8.tar.gz
pgadmin4-7.8.tar.gz.asc
pgadmin4-desktop
pgadmin4.desktop
update-vendor.sh
vendor.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pgadmin4.spec ++++++
--- /var/tmp/diff_new_pack.rr35xK/_old 2023-10-30 22:10:26.683462649 +0100
+++ /var/tmp/diff_new_pack.rr35xK/_new 2023-10-30 22:10:26.683462649 +0100
@@ -22,7 +22,9 @@
%global python3_azure_mgmt_rdbms_min_version 10.1
%global python3_azure_mgmt_resource_min_version 23.0
%global python3_azure_mgmt_subscription_min_version 3.1
+%global python3_bcrypt_min_version 4.0
%global python3_boto3_min_version 1.26
+%global python3_botocore_min_version 1.31
%global python3_flask_babel_min_version 3.1.0
%global python3_flask_compress_min_version 1.4.0
%global python3_flask_gravatar_min_version 0.5.0
@@ -48,7 +50,6 @@
%global python3_python_dateutil_min_version 2.8.0
%global python3_pytz_min_version 2023.0
%global python3_qrcode_min_version 7.0
-%global python3_speaklater_min_version 1.3
%global python3_sqlalchemy_min_version 2.0
%global python3_sqlparse_min_version 0.3.0
%global python3_sshtunnel_min_version 0.1.5
@@ -57,34 +58,39 @@
%global python3_wtforms_min_version 3.0
%global pgadmin4instdir %{_libdir}/pgadmin4-%{version}
-%global pgadmin4homedir /var/lib/pgadmin
+%global pgadmin4homedir %{_localstatedir}/lib/pgadmin
%global user_group_name pgadmin
Name: pgadmin4
-Version: 7.6
+Version: 7.8
Release: 0
Summary: Management tool for PostgreSQL
License: PostgreSQL
Group: Productivity/Databases/Tools
URL: http://www.pgadmin.org
Source0: https://download.postgresql.org/pub/pgadmin/%{name}/v%{version}/source/%{na…
-Source10: https://download.postgresql.org/pub/pgadmin/%{name}/v%{version}/source/%{na…
-# https://www.pgadmin.org/download/pgadmin-4-source-code/
-Source11: %{name}.keyring
Source1: %{name}.conf.in
Source2: %{name}.service.in
Source3: %{name}.tmpfiles.d
-Source4: %{name}.desktop.in
-Source6: %{name}.qt.conf.in
+Source4: %{name}.desktop
Source7: %{name}.uwsgi.in
Source8: README.SUSE
Source9: README.SUSE.uwsgi.in
+Source10: https://download.postgresql.org/pub/pgadmin/%{name}/v%{version}/source/%{na…
+# https://www.pgadmin.org/download/pgadmin-4-source-code/
+Source11: %{name}.keyring
+Source12: vendor.tar.xz
+Source13: %{name}-desktop
+Source99: update-vendor.sh
Patch0: use-os-makedirs.patch
Patch1: fix-python3-crypto-call.patch
Patch2: support-new-azure-mgmt-rdbms.patch
Patch3: support-new-werkzeug.patch
Patch4: support-new-flask.patch
+Patch5: fix-eventlet-select_epoll.patch
BuildRequires: fdupes
+BuildRequires: hicolor-icon-theme
+BuildRequires: optipng
BuildRequires: python-rpm-macros
BuildRequires: python3-Authlib >= %{python3_authlib_min_version}
BuildRequires: python3-Flask >= %{python3_flask_min_version}
@@ -99,7 +105,6 @@
BuildRequires: python3-Flask-Security-Too >= %{python3_flask_security_too_min_version}
BuildRequires: python3-Flask-SocketIO >= %{python3_flask_socketio_min_version}
BuildRequires: python3-Flask-WTF >= %{python3_flask_wtf_min_version}
-BuildRequires: python3-Pillow >= %{python3_pillow_min_version}
BuildRequires: python3-SQLAlchemy >= %{python3_sqlalchemy_min_version}
BuildRequires: python3-WTForms >= %{python3_wtforms_min_version}
BuildRequires: python3-Werkzeug >= %{python3_werkzeug_min_version}
@@ -107,7 +112,9 @@
BuildRequires: python3-azure-mgmt-rdbms >= %{python3_azure_mgmt_rdbms_min_version}
BuildRequires: python3-azure-mgmt-resource >= %{python3_azure_mgmt_resource_min_version}
BuildRequires: python3-azure-mgmt-subscription >= %{python3_azure_mgmt_subscription_min_version}
+BuildRequires: python3-bcrypt >= %{python3_bcrypt_min_version}
BuildRequires: python3-boto3 >= %{python3_boto3_min_version}
+BuildRequires: python3-botocore >= %{python3_botocore_min_version}
BuildRequires: python3-cryptography
BuildRequires: python3-eventlet
BuildRequires: python3-google-api-python-client >= %{python3_google_api_python_client_min_version}
@@ -123,8 +130,6 @@
BuildRequires: python3-python-dateutil >= %{python3_python_dateutil_min_version}
BuildRequires: python3-pytz >= %{python3_pytz_min_version}
BuildRequires: python3-qrcode >= %{python3_qrcode_min_version}
-BuildRequires: python3-selenium
-BuildRequires: python3-speaklater >= %{python3_speaklater_min_version}
BuildRequires: python3-sqlparse >= %{python3_sqlparse_min_version}
BuildRequires: python3-sshtunnel >= %{python3_sshtunnel_min_version}
BuildRequires: python3-testscenarios
@@ -132,26 +137,8 @@
BuildRequires: python3-user-agents >= %{python3_user_agents_min_version}
BuildRequires: python3-wheel
BuildRequires: systemd-rpm-macros
-Requires: %{name}-web = %{version}
+BuildRequires: yarn
Requires: python3 >= 3.7
-BuildArch: noarch
-%{?systemd_requires}
-
-%description
-pgAdmin 4 is a rewrite of the pgAdmin3 management tool for the
-PostgreSQL database. It is written as a web application in Python,
-using jQuery and Bootstrap for the client side processing and UI. On
-the server side, Flask is being utilised.
-
-This variant is a Qt-based runtime application intended to allow the
-standalone use on a workstation - it is essentially a browser and
-Python interpretor in one package which will be capable of hosting
-the Python application and presenting it to the user as a desktop
-application.
-
-%package web
-Summary: Web package for pgAdmin4
-Group: Productivity/Databases/Tools
Requires: python3-Authlib >= %{python3_authlib_min_version}
Requires: python3-Flask >= %{python3_flask_min_version}
Requires: python3-Flask-Babel >= %{python3_flask_babel_min_version}
@@ -165,7 +152,6 @@
Requires: python3-Flask-Security-Too >= %{python3_flask_security_too_min_version}
Requires: python3-Flask-SocketIO >= %{python3_flask_socketio_min_version}
Requires: python3-Flask-WTF >= %{python3_flask_wtf_min_version}
-Requires: python3-Pillow >= %{python3_pillow_min_version}
Requires: python3-SQLAlchemy >= %{python3_sqlalchemy_min_version}
Requires: python3-WTForms >= %{python3_wtforms_min_version}
Requires: python3-Werkzeug >= %{python3_werkzeug_min_version}
@@ -173,7 +159,9 @@
Requires: python3-azure-mgmt-rdbms >= %{python3_azure_mgmt_rdbms_min_version}
Requires: python3-azure-mgmt-resource >= %{python3_azure_mgmt_resource_min_version}
Requires: python3-azure-mgmt-subscription >= %{python3_azure_mgmt_subscription_min_version}
+Requires: python3-bcrypt >= %{python3_bcrypt_min_version}
Requires: python3-boto3 >= %{python3_boto3_min_version}
+Requires: python3-botocore >= %{python3_botocore_min_version}
Requires: python3-cryptography
Requires: python3-eventlet
Requires: python3-google-api-python-client >= %{python3_google_api_python_client_min_version}
@@ -188,17 +176,22 @@
Requires: python3-python-dateutil >= %{python3_python_dateutil_min_version}
Requires: python3-pytz >= %{python3_pytz_min_version}
Requires: python3-qrcode >= %{python3_qrcode_min_version}
-Requires: python3-speaklater >= %{python3_speaklater_min_version}
Requires: python3-sqlparse >= %{python3_sqlparse_min_version}
Requires: python3-sshtunnel >= %{python3_sshtunnel_min_version}
Requires: python3-urllib3 < 2
Requires: python3-user-agents >= %{python3_user_agents_min_version}
-Recommends: python3-mod_wsgi
+Suggests: python3-mod_wsgi
Suggests: %{name}-doc
+Recommends: %{name}-desktop
+Obsoletes: %{name}-web < %{version}
+%{?systemd_requires}
+BuildArch: noarch
-%description web
+%description
pgAdmin 4 is a rewrite of the pgAdmin3 management tool for the
-PostgreSQL database.
+PostgreSQL database. It is written as a web application in Python,
+using jQuery and Bootstrap for the client side processing and UI. On
+the server side, Flask is being utilised.
This package contains the required files to run pgAdmin4 as a web application
@@ -215,7 +208,7 @@
%package web-uwsgi
Summary: Pgamdin4 - uwsgi configuration
Group: Productivity/Networking/Web/Utilities
-Requires: pgadmin4-web
+Requires: pgadmin4
Requires: uwsgi
%description web-uwsgi
@@ -223,23 +216,62 @@
This package holds the uwsgi configuration.
+%package desktop
+Summary: Desktop application for pgAdmin4
+Group: Documentation/HTML
+Requires: %{name}
+Requires: python3-PyQt6
+
+%description desktop
+pgAdmin 4 is a rewrite of the pgAdmin3 management tool for the
+PostgreSQL database.
+
+This package provides a small python script that can be used
+to start pgAdmin4 as a regular user and provides a simple ui
+as a system tray icon to open more windows or quit.
+
+Note that his script is not related to the official pgAdmin4
+runtime application and is NOT supported by the pgAdmin project
+but only provided for convenience.
+
%prep
%autosetup -p1
sed -e 's@PYTHONSITELIB@%{python3_sitelib}@g' <%{SOURCE1} > %{name}.conf
sed -e 's@PYTHONDIR@%{_bindir}/python3@g' -e 's@PYTHONSITELIB@%{python3_sitelib}@g' < %{SOURCE2} > %{name}.service
sed -e 's@PYTHONDIR@%{_bindir}/python3@g' -e 's@PYTHONSITELIB@%{python3_sitelib}@g' < %{SOURCE4} > %{name}.desktop
-sed -e 's@PYTHONSITELIB64@%{python3_sitearch}@g' -e 's@PYTHONSITELIB@%{python3_sitelib}@g' <%{SOURCE6} > %{name}.qt.conf
sed -e 's@PYTHONSITELIB@%{python3_sitelib}@g' <%{SOURCE7} > %{name}.uwsgi
sed -e 's@PYTHONSITELIB@%{python3_sitelib}@g' <%{SOURCE9} > README.SUSE.uwsgi
+# speaklater isn't really used
+sed -i -e 's/^speaklater.*//' requirements.txt
+
cp %{SOURCE8} .
cp %{SOURCE9} .
+
# rpmlint
chmod -x docs/en_US/theme/pgadmin4/static/style.css
chmod -x docs/en_US/theme/pgadmin4/theme.conf
+# This package is run using the interpreter so it doesn't need the executable bit set
+chmod -x web/pgadmin/misc/bgprocess/process_executor.py
+chmod -x web/pgadmin/static/fonts/*.ttf
+
+# Uncompress the vendor sources
+tar xvfJ %{SOURCE12}
+# Use the system optipng, not the one built when creating the vendor package in the developer workstation
+ln -s %{_bindir}/optipng web/node_modules/optipng-bin/vendor/optipng
+
+# Do not use env as script interpreter
+find web/node_modules -type f -executable -exec sed -i -e '1{s,^#! */usr/bin/env \(node\|python3|bash\),#!%{_bindir}/\1,}' "{}" \;
+find web/pgacloud -type f -executable -exec sed -i -e '1{s,^#! */usr/bin/env \(node\|python3\),#!%{_bindir}/\1,}' "{}" \;
+
+rm web/regression/.gitignore
%build
+make bundle
+rm -Rf web/node_modules web/yarn.lock
+
+export EVENTLET_NO_GREENDNS='yes'
mkdir -p pip-build/pgadmin4
cp -a web/* pip-build/pgadmin4
echo recursive-include pgadmin4 \* > pip-build/MANIFEST.in
@@ -278,11 +310,6 @@
install -d -m 0755 %{buildroot}%{_sysconfdir}/pgadmin/
echo "# SERVER_MODE = True" > %{buildroot}%{_sysconfdir}/pgadmin/config_system.py
-# Install QT conf file
-# This directory will/may change in future releases.
-install -d "%{buildroot}%{_sysconfdir}/xdg/pgadmin/"
-install -m 0644 -p %{name}.qt.conf %{buildroot}%{_sysconfdir}/xdg/pgadmin/pgadmin4.conf
-
# Install unit file/init script
# This is only for systemd supported distros:
install -d %{buildroot}%{_unitdir}
@@ -295,32 +322,42 @@
chmod -x %{buildroot}%{_docdir}/%{name}-docs/en_US/images/*
mkdir -p %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcpgadmin4
-%fdupes %{buildroot}%{_prefix}
install -d -m 0755 %{buildroot}%{pgadmin4homedir}
install -d -m 0755 %{buildroot}%{pgadmin4homedir}/storage
install -d -m 0700 %{buildroot}%{pgadmin4homedir}/sessions
+install -d -m 0755 %{buildroot}%{_localstatedir}/log/pgadmin
install -d -m 0755 %{buildroot}%{_sysconfdir}/uwsgi/vassals
install -m 0644 %{name}.uwsgi %{buildroot}%{_sysconfdir}/uwsgi/vassals/pgadmin4.ini
-##%check
+install -d -m 0755 %{buildroot}%{_datadir}/icons/hicolor/256x256/apps
+install -m 0644 web/pgadmin/static/img/logo-256.png %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/pgadmin4.png
+
+install -d -m 0755 %{buildroot}%{python3_sitelib}/%{name}/assets
+install -m 0644 ./runtime/assets/welcome_logo.svg %{buildroot}%{python3_sitelib}/%{name}/assets/welcome_logo.svg
+
+install -m 0755 %{SOURCE13} %{buildroot}%{_bindir}
+
+%fdupes %{buildroot}%{python3_sitelib}
+
+##%% check
## Requires Postgres running
-##PYTHONPATH=%{buildroot}%{python3_sitelib} python3 -B web/regression/runtests.py --exclude feature_tests
+##PYTHONPATH=%%{buildroot}%%{python3_sitelib} python3 -B web/regression/runtests.py --exclude feature_tests
-%pre web
+%pre
/usr/sbin/groupadd -r %{user_group_name} &>/dev/null || :
/usr/sbin/useradd -g %{user_group_name} -s /bin/false -r -c "%{name}" -d %{pgadmin4homedir} %{user_group_name} &>/dev/null || :
%service_add_pre %{name}.service
-%post web
+%post
%service_add_post %{name}.service
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf
-%preun web
+%preun
%service_del_preun %{name}.service
-%postun web
+%postun
chown -R %{user_group_name}:%{user_group_name} %{pgadmin4homedir}
%service_del_postun %{name}.service
@@ -329,12 +366,7 @@
%doc README.md README.SUSE
%license LICENSE
%{_bindir}/pgadmin4
-%{_datadir}/applications/%{name}.desktop
-%dir %{_sysconfdir}/xdg/pgadmin
-%config %{_sysconfdir}/xdg/pgadmin/pgadmin4.conf
-%files web
-%defattr(-,root,root,-)
%dir %{_sysconfdir}/apache2
%dir %{_sysconfdir}/apache2/conf.d
%config(noreplace) %{_sysconfdir}/apache2/conf.d/%{name}.conf
@@ -355,6 +387,7 @@
%dir %{pgadmin4homedir}
%dir %{pgadmin4homedir}/storage
%attr(700,%{user_group_name},%{user_group_name}) %dir %{pgadmin4homedir}/sessions
+%dir %{_localstatedir}/log/pgadmin
%files doc
%defattr(-,root,root,-)
@@ -368,3 +401,9 @@
%dir %{_sysconfdir}/uwsgi/vassals
%config (noreplace) %{_sysconfdir}/uwsgi/vassals/pgadmin4.ini
+%files desktop
+%defattr(-,root,root,-)
+%{_bindir}/pgadmin4-desktop
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/256x256/apps/pgadmin4.png
+
++++++ README.SUSE.uwsgi.in ++++++
--- /var/tmp/diff_new_pack.rr35xK/_old 2023-10-30 22:10:26.735464567 +0100
+++ /var/tmp/diff_new_pack.rr35xK/_new 2023-10-30 22:10:26.739464715 +0100
@@ -1,13 +1,13 @@
To configure pgadmin with Apache and uwsgi, just add the follwing lines to a vhost:
ProxyPass /pgadmin unix:/run/uwsgi/uwsgi-pgadmin.sock|uwsgi://localhost/
- <Directory PYTHONSITELIB/pgadmin4-web/>
+ <Directory PYTHONSITELIB/pgadmin4/>
Require all granted
</Directory>
Note that you have to run once `pgadmin4` from the command line to set the master password
by executing:
- /usr/bin/python3 PYTHONSITELIB/pgadmin4-web/pgAdmin4.py
+ /usr/bin/python3 PYTHONSITELIB/pgadmin4/pgAdmin4.py
++++++ fix-eventlet-select_epoll.patch ++++++
pgAdmin4 fails to build with eventlet 0.33.3, httpcore 0.17.1 and httpx 0.24.0
with the error:
[ 12s] + python3 ../pkg/pip/setup_pip.py bdist_wheel
[ 13s] Traceback (most recent call last):
[ 13s] File "/home/abuild/rpmbuild/BUILD/pgadmin4-7.6/pip-build/../pkg/pip/setup_pip.py", line 56, in <module>
[ 13s] import config
[ 13s] File "/home/abuild/rpmbuild/BUILD/pgadmin4-7.6/pip-build/../web/config.py", line 32, in <module>
[ 13s] from pgadmin.utils import env, IS_WIN, fs_short_path
[ 13s] File "/home/abuild/rpmbuild/BUILD/pgadmin4-7.6/web/pgadmin/__init__.py", line 25, in <module>
[ 13s] from flask_socketio import SocketIO
[ 13s] File "/usr/lib/python3.11/site-packages/flask_socketio/__init__.py", line 9, in <module>
[ 13s] from socketio import socketio_manage # noqa: F401
[ 13s] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ 13s] File "/usr/lib/python3.11/site-packages/socketio/__init__.py", line 9, in <module>
[ 13s] from .zmq_manager import ZmqManager
[ 13s] File "/usr/lib/python3.11/site-packages/socketio/zmq_manager.py", line 5, in <module>
[ 13s] import eventlet.green.zmq as zmq
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/__init__.py", line 17, in <module>
[ 13s] from eventlet import convenience
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/convenience.py", line 7, in <module>
[ 13s] from eventlet.green import socket
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/green/socket.py", line 21, in <module>
[ 13s] from eventlet.support import greendns
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/support/greendns.py", line 79, in <module>
[ 13s] setattr(dns, pkg, import_patched('dns.' + pkg))
[ 13s] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/support/greendns.py", line 61, in import_patched
[ 13s] return patcher.import_patched(module_name, **modules)
[ 13s] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/patcher.py", line 132, in import_patched
[ 13s] return inject(
[ 13s] ^^^^^^^
[ 13s] File "/usr/lib/python3.11/site-packages/eventlet/patcher.py", line 109, in inject
[ 13s] module = __import__(module_name, {}, {}, module_name.split('.')[:-1])
[ 13s] ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
[ 13s] File "/usr/lib/python3.11/site-packages/dns/asyncquery.py", line 38, in <module>
[ 13s] from dns.query import (
[ 13s] File "/usr/lib/python3.11/site-packages/dns/query.py", line 63, in <module>
[ 13s] import httpcore
[ 13s] File "/usr/lib/python3.11/site-packages/httpcore/__init__.py", line 1, in <module>
[ 13s] from ._api import request, stream
[ 13s] File "/usr/lib/python3.11/site-packages/httpcore/_api.py", line 5, in <module>
[ 13s] from ._sync.connection_pool import ConnectionPool
[ 13s] File "/usr/lib/python3.11/site-packages/httpcore/_sync/__init__.py", line 1, in <module>
[ 13s] from .connection import HTTPConnection
[ 13s] File "/usr/lib/python3.11/site-packages/httpcore/_sync/connection.py", line 12, in <module>
[ 13s] from .._synchronization import Lock
[ 13s] File "/usr/lib/python3.11/site-packages/httpcore/_synchronization.py", line 13, in <module>
[ 13s] import trio
[ 13s] File "/usr/lib/python3.11/site-packages/trio/__init__.py", line 18, in <module>
[ 13s] from ._core import (
[ 13s] File "/usr/lib/python3.11/site-packages/trio/_core/__init__.py", line 27, in <module>
[ 13s] from ._run import (
[ 13s] File "/usr/lib/python3.11/site-packages/trio/_core/_run.py", line 2452, in <module>
[ 13s] from ._io_epoll import EpollIOManager as TheIOManager
[ 13s] File "/usr/lib/python3.11/site-packages/trio/_core/_io_epoll.py", line 188, in <module>
[ 13s] class EpollIOManager:
[ 13s] File "/usr/lib/python3.11/site-packages/trio/_core/_io_epoll.py", line 189, in EpollIOManager
[ 13s] _epoll = attr.ib(factory=select.epoll)
[ 13s] ^^^^^^^^^^^^
[ 13s] AttributeError: module 'eventlet.green.select' has no attribute 'epoll'
[ 13s] error: Bad exit status from /var/tmp/rpm-tmp.ElnKCg (%build)
Setting the environment variable EVENTLET_NO_GREENDNS works around
this while the upstream issue is fixed:
https://github.com/eventlet/eventlet/issues/805
Index: pgadmin4-7.8/web/pgAdmin4.py
===================================================================
--- pgadmin4-7.8.orig/web/pgAdmin4.py
+++ pgadmin4-7.8/web/pgAdmin4.py
@@ -20,6 +20,7 @@ if sys.version_info < (3, 4):
'or later.')
import builtins
import os
+os.environ['EVENTLET_NO_GREENDNS'] = 'yes'
# We need to include the root directory in sys.path to ensure that we can
# find everything we need when running in the standalone runtime.
++++++ pgadmin4-7.6.tar.gz -> pgadmin4-7.8.tar.gz ++++++
/work/SRC/openSUSE:Factory/pgadmin4/pgadmin4-7.6.tar.gz /work/SRC/openSUSE:Factory/.pgadmin4.new.17445/pgadmin4-7.8.tar.gz differ: char 18, line 1
++++++ pgadmin4-desktop ++++++
#!/usr/bin/python3
#
# This is a small script that tries to replace pgadmin4-runtime as
# a desktop version of pgadmin4.
# pgadmin4-runtime uses NW.js (which is based on Chromium and Node.js) which
# makes it hard to package in a standard way.
# pgadmin4-desktop tries to be a simple replacement which just runs pgadmin4
# in runtime mode but uses Qt6 for the GUI in order to show an icon in the
# system tray and provide two options: open a new browser window with pgAdmin
# and quit the application.
#
# This script is released under the PostgreSQL License.
# (C) 2023 Antonio Larrosa <alarrosa(a)suse.com>
import subprocess
import os
import os.path
import uuid
import socket
import time
import sys
import fcntl
from threading import Thread, Timer
from PyQt6.QtWidgets import QApplication, QSystemTrayIcon, QMenu, QSplashScreen
from PyQt6.QtGui import QIcon, QAction, QPixmap, QImage, QPalette, QPainter
from PyQt6.QtCore import QTimer, Qt
class PGAdminDesktop(QApplication):
def __init__(self):
super().__init__(sys.argv)
self.environ = os.environ
self.pgadmin_process = None
self.url = None
self.setQuitOnLastWindowClosed(False)
self.aboutToQuit.connect(self.cleanup)
self.create_ui()
pixmap = self.load_splash_pixmap()
if pixmap:
self.splash = QSplashScreen(pixmap)
self.splash.showMessage("Starting pgAdmin.", Qt.AlignmentFlag.AlignBottom)
self.splash.show()
else:
self.splash = None
self.run_pgadmin_server()
QTimer.singleShot(500, self.open_pgadmin)
def load_splash_pixmap(self):
paths = [path + '/pgadmin4/assets/welcome_logo.svg' for path in sys.path]
paths = [path for path in paths if os.path.exists(path)]
if not paths:
return None
return QPixmap(paths[0])
def run_pgadmin_server(self):
if 'PGADMIN_INT_KEY' not in self.environ:
self.environ['PGADMIN_INT_KEY'] = str(uuid.uuid4())
if 'PGADMIN_INT_PORT' not in self.environ:
self.environ['PGADMIN_INT_PORT'] = '5051'
self.environ['PGADMIN_SERVER_MODE'] = 'OFF'
self.pgadmin_process = subprocess.Popen(['pgadmin4'],
env=self.environ, shell=True)
def create_ui(self):
icon = QIcon.fromTheme("pgadmin4")
self.tray = QSystemTrayIcon()
self.tray.setIcon(icon)
self.tray.setVisible(True)
menu = QMenu()
self.title = QAction("pgAdmin")
self.title.setEnabled(False)
menu.addAction(self.title)
menu.addSeparator()
self.openPGAdminAction = QAction("New Window")
menu.addAction(self.openPGAdminAction)
self.openPGAdminAction.triggered.connect(self.open_pgadmin)
self.quitAction = QAction("Quit")
menu.addAction(self.quitAction)
self.quitAction.triggered.connect(self.quit)
self.tray.setContextMenu(menu)
def open_pgadmin_task(self):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(1)
result = sock.connect_ex(('127.0.0.1',
int(self.environ['PGADMIN_INT_PORT'])))
c = 0
while result != 0 and c < 15:
time.sleep(1)
result = sock.connect_ex(('127.0.0.1',
int(self.environ['PGADMIN_INT_PORT'])))
c += 1
dots = "." * (c % 3 + 1)
self.openPGAdminAction.setText("Opening pgAdmin" + dots)
if self.splash and not self.splash.isHidden():
self.splash.showMessage("Starting pgAdmin" + dots, Qt.AlignmentFlag.AlignBottom)
if result == 0:
if self.splash:
self.splash.hide()
port = self.environ['PGADMIN_INT_PORT']
key = self.environ['PGADMIN_INT_KEY']
subprocess.run(["xdg-open", f"http://127.0.0.1:{port}/?key={key}"])
else:
error_msg = 'Timeout waiting for pgAdmin to start. Exiting...'
print(error_msg)
self.splash.showMessage(error_msg, Qt.AlignmentFlag.AlignBottom)
QTimer.singleShot(10000, self.quit)
self.openPGAdminAction.setText("New Window")
self.openPGAdminAction.setEnabled(True)
def open_pgadmin(self):
self.open_pgadmin_thread = Thread(target=self.open_pgadmin_task)
self.openPGAdminAction.setText("Opening pgAdmin...")
self.openPGAdminAction.setEnabled(False)
self.open_pgadmin_thread.start()
def cleanup(self):
self.pgadmin_process.kill()
if __name__ == '__main__':
app = PGAdminDesktop()
sys.exit(app.exec())
++++++ pgadmin4.conf.in ++++++
--- /var/tmp/diff_new_pack.rr35xK/_old 2023-10-30 22:10:26.847468699 +0100
+++ /var/tmp/diff_new_pack.rr35xK/_new 2023-10-30 22:10:26.847468699 +0100
@@ -7,9 +7,9 @@
<IfDefine PGADMIN>
WSGIDaemonProcess pgadmin processes=1 threads=25
-WSGIScriptAlias /pgadmin4 PYTHONSITELIB/pgadmin4-web/pgAdmin4.wsgi
+WSGIScriptAlias /pgadmin4 PYTHONSITELIB/pgadmin4/pgAdmin4.wsgi
-<Directory PYTHONSITELIB/pgadmin4-web/>
+<Directory PYTHONSITELIB/pgadmin4/>
WSGIProcessGroup pgadmin
WSGIApplicationGroup %{GLOBAL}
<IfModule mod_authz_core.c>
++++++ pgadmin4.desktop ++++++
[Desktop Entry]
Name=pgAdmin 4
Exec=/usr/bin/pgadmin4-desktop
Icon=pgadmin4
Type=Application
Categories=Development;Database;GUIDesigner;
MimeType=text/html
Comment=Management tool for PostgreSQL
Keywords=database;db;sql;query;administration;development;
++++++ pgadmin4.service.in ++++++
--- /var/tmp/diff_new_pack.rr35xK/_old 2023-10-30 22:10:26.891470322 +0100
+++ /var/tmp/diff_new_pack.rr35xK/_new 2023-10-30 22:10:26.895470470 +0100
@@ -18,7 +18,7 @@
User=pgadmin
Group=pgadmin
-ExecStart=PYTHONDIR PYTHONSITELIB/pgadmin4-web/pgAdmin4.py
+ExecStart=PYTHONDIR PYTHONSITELIB/pgadmin4/pgAdmin4.py
ExecReload=/bin/kill -HUP $MAINPID
KillMode=mixed
KillSignal=SIGINT
++++++ pgadmin4.uwsgi.in ++++++
--- /var/tmp/diff_new_pack.rr35xK/_old 2023-10-30 22:10:26.923471503 +0100
+++ /var/tmp/diff_new_pack.rr35xK/_new 2023-10-30 22:10:26.927471651 +0100
@@ -13,6 +13,6 @@
chown-socket = wwwrun:www
plugin = python3
-chdir = PYTHONSITELIB/pgadmin4-web/
+chdir = PYTHONSITELIB/pgadmin4/
mount = /=pgAdmin4:app
++++++ update-vendor.sh ++++++
#!/bin/bash
#
# This script updates the vendor source package.
# It should be run in the developer system in each pgadmin version update
#
# -- Antonio Larrosa <alarrosa(a)suse.com>
#
version=`grep ^Version: *.spec | sed -e "s/^Version: *//"`
if [ -d pgadmin4-$version ]; then
echo "The directory pgadmin4-$version already exists. Please remove it in order to recreate it from scratch by running"
echo "rm -Rf pgadmin4-$version"
exit 1
fi
quilt setup pgadmin4.spec
pushd pgadmin4-$version
quilt push -a
# Build everything as documented by upstream
make install-node
## We can run make bundle in %build so let's keep the things we do outside obs at a minimum
#make bundle
# Remove binary files that are not needed and shouldn't be packaged in a noarch package
rm web/node_modules/ttf2woff2/build/Release/addon.node
rm web/node_modules/ttf2woff2/build/Release/obj.target/addon.node
rm web/node_modules/ttf2woff2/build/node_gyp_bins/python3
rm web/node_modules/mozjpeg/vendor/cjpeg
rm web/node_modules/optipng-bin/vendor/optipng
# Remove trash files
rm web/node_modules/console-control-strings/README.md~
rm web/node_modules/form-data/README.md.bak
# Remove development files
rm -Rf web/node_modules/ttf2woff2/build/Release/obj.target/addon/csrc
rm web/node_modules/nan/*.h
rm web/node_modules/ttf2woff2/csrc/*/*.h
# Fix files unnecessarily having the executable bit set
find web/node_modules -type f \( -iname *.md -o -iname LICEN[CS]E -o -iname *.html -o -iname *.json -o -iname *.css -o -iname *.ttf -o -iname *.png \) -exec chmod -x "{}" \;
tar cvfJ ../vendor.tar.xz web/node_modules web/pgadmin/misc/themes/pgadmin.themes.json web/pgadmin/static/js/generated/ web/yarn.lock
popd
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package python-Flask-Login for openSUSE:Factory checked in at 2023-10-30 22:10:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-Flask-Login (Old)
and /work/SRC/openSUSE:Factory/.python-Flask-Login.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-Flask-Login"
Mon Oct 30 22:10:10 2023 rev:7 rq:1121150 version:0.6.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-Flask-Login/python-Flask-Login.changes 2022-09-30 17:58:33.809347248 +0200
+++ /work/SRC/openSUSE:Factory/.python-Flask-Login.new.17445/python-Flask-Login.changes 2023-10-30 22:10:21.547273166 +0100
@@ -1,0 +2,7 @@
+Mon Oct 30 08:22:57 UTC 2023 - Antonio Larrosa <alarrosa(a)suse.com>
+
+- Add patch from upstream to fix compatibility with Werkzeug 3.0.x
+ where werkzeug.urls removed url_decode/url_encode:
+ * 0001-fix-avoid-Deprecated-werkzeug.urls.url_decode.patch
+
+-------------------------------------------------------------------
New:
----
0001-fix-avoid-Deprecated-werkzeug.urls.url_decode.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-Flask-Login.spec ++++++
--- /var/tmp/diff_new_pack.MJrPta/_old 2023-10-30 22:10:22.255299286 +0100
+++ /var/tmp/diff_new_pack.MJrPta/_new 2023-10-30 22:10:22.259299434 +0100
@@ -1,7 +1,7 @@
#
# spec file for package python-Flask-Login
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
License: MIT
URL: https://github.com/maxcountryman/flask-login
Source: https://files.pythonhosted.org/packages/source/F/Flask-Login/Flask-Login-%{…
+# FIX-UPSTREAM-PATCH
+Patch0: 0001-fix-avoid-Deprecated-werkzeug.urls.url_decode.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
@@ -47,7 +49,7 @@
loading users from their ID.
%prep
-%setup -q -n Flask-Login-%{version}
+%autosetup -p1 -n Flask-Login-%{version}
%build
%python_build
++++++ 0001-fix-avoid-Deprecated-werkzeug.urls.url_decode.patch ++++++
From 7b170bf4e5e0240fe084166c9ca6ec4fba258dcd Mon Sep 17 00:00:00 2001
From: Hiromasa Ihara <iharahiromasa(a)gmail.com>
Date: Mon, 2 Oct 2023 20:14:40 +0900
Subject: [PATCH] fix: avoid DeprecationWarning 'werkzeug.urls.url_decode' is
deprecated (#746)
---
src/flask_login/utils.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/flask_login/utils.py b/src/flask_login/utils.py
index c3c46846..45a7e279 100644
--- a/src/flask_login/utils.py
+++ b/src/flask_login/utils.py
@@ -3,6 +3,8 @@
from hashlib import sha512
from urllib.parse import urlparse
from urllib.parse import urlunparse
+from urllib.parse import parse_qs
+from urllib.parse import urlencode
from flask import current_app
from flask import g
@@ -11,8 +13,6 @@
from flask import session
from flask import url_for
from werkzeug.local import LocalProxy
-from werkzeug.urls import url_decode
-from werkzeug.urls import url_encode
from .config import COOKIE_NAME
from .config import EXEMPT_METHODS
@@ -123,11 +123,11 @@ def login_url(login_view, next_url=None, next_field="next"):
return base
parsed_result = urlparse(base)
- md = url_decode(parsed_result.query)
+ md = parse_qs(parsed_result.query)
md[next_field] = make_next_param(base, next_url)
netloc = current_app.config.get("FORCE_HOST_FOR_REDIRECTS") or parsed_result.netloc
parsed_result = parsed_result._replace(
- netloc=netloc, query=url_encode(md, sort=True)
+ netloc=netloc, query=urlencode(md, doseq=True)
)
return urlunparse(parsed_result)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package vulkan-validationlayers for openSUSE:Factory checked in at 2023-10-30 22:10:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/vulkan-validationlayers (Old)
and /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan-validationlayers"
Mon Oct 30 22:10:09 2023 rev:46 rq:1120704 version:1.3.268.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/vulkan-validationlayers/vulkan-validationlayers.changes 2023-08-28 17:12:14.854256643 +0200
+++ /work/SRC/openSUSE:Factory/.vulkan-validationlayers.new.17445/vulkan-validationlayers.changes 2023-10-30 22:10:19.375193033 +0100
@@ -1,0 +2,26 @@
+Fri Oct 27 04:13:02 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release SDK-1.3.268.0
+ * layers: Add support for Image Layout check for CopyImage
+ * layers: Add support for TransitionImageLayoutEXT record
+ * layers: Add layout checks to MemoryToImage & ImageToMemory
+ * layers: Add validation for VK_EXT_shader_object,
+ VkHostImageLayoutTransitionInfoEXT, VkCopyImageToImageEXT
+ * layers: Add vkGetImageSubresourceLayout2KHR,
+ ValidateHostCopyImageCreateInfos
+ * layers: Support per-present-mode surface capabilities
+ * layers: Introduce barrier structures
+ * layers: Add thread safety checks for vkQueuePresentKHR
+ * gpu: Remove SPIR-V disassembly from generated headers
+ * layers: Add VK_EXT_calibrated_timestamps
+ * More validations passes: invalid compute pipeline flags, linked
+ tessellation shaders, mesh work groups, MRTSS rasterization
+ samples, geometry shader input topology, pipeline formats in
+ secondary cmd buffers, mesh shader queries, pipeline library
+ flags, texel block extent in image copy, color attachments with
+ advanced blend.
+ * gpu: Add ability to select which shaders get instrumented
+ * gpu: Use vku utilities for GPU-AV settings
+- Delete gcc13.diff, seems obsolete
+
+-------------------------------------------------------------------
Old:
----
gcc13.diff
sdk-1.3.261.0.tar.gz
New:
----
vulkan-sdk-1.3.268.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ vulkan-validationlayers.spec ++++++
--- /var/tmp/diff_new_pack.qAGn85/_old 2023-10-30 22:10:20.807245865 +0100
+++ /var/tmp/diff_new_pack.qAGn85/_new 2023-10-30 22:10:20.807245865 +0100
@@ -17,31 +17,30 @@
Name: vulkan-validationlayers
-Version: 1.3.261.0
+Version: 1.3.268.0
Release: 0
-%define lname libVkLayer_utils-1_3_261_0
Summary: Validation layers for Vulkan
License: Apache-2.0
Group: Development/Tools/Other
URL: https://github.com/KhronosGroup/Vulkan-ValidationLayers
-Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/s…
+Source: https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/refs/tags/v…
Patch2: xxhash.diff
-Patch3: gcc13.diff
BuildRequires: cmake >= 3.7.12
%if 0%{?suse_version} >= 1599
BuildRequires: gcc-c++
%else
BuildRequires: gcc11-c++
%endif
-BuildRequires: glslang-devel >= 12.3.1+sdk261
+BuildRequires: glslang-devel >= 13.1.0
BuildRequires: memory-constraints
BuildRequires: pkg-config
BuildRequires: python3-base
-BuildRequires: spirv-headers >= 1.6.1+sdk250
-BuildRequires: spirv-tools-devel >= 2023.4~rc2
+BuildRequires: spirv-headers >= 1.6.1+sdk268
+BuildRequires: spirv-tools-devel >= 2023.5~rc1
BuildRequires: vulkan-headers
+BuildRequires: vulkan-utility-libraries-devel >= 1.3.268
BuildRequires: xxhash-devel
-BuildRequires: pkgconfig(vulkan) >= 1.3.261
+BuildRequires: pkgconfig(vulkan) >= 1.3.268
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xcb)
Conflicts: vulkan < 1.1
@@ -53,7 +52,7 @@
This package contains the Khronos official Vulkan validation layers.
%prep
-%autosetup -n Vulkan-ValidationLayers-sdk-%version -p1
+%autosetup -n Vulkan-ValidationLayers-vulkan-sdk-%version -p1
perl -i -pe 's{\@PACKAGE_VERSION\@}{%version}' CMakeLists.txt */CMakeLists.txt
%build
++++++ xxhash.diff ++++++
--- /var/tmp/diff_new_pack.qAGn85/_old 2023-10-30 22:10:20.855247635 +0100
+++ /var/tmp/diff_new_pack.qAGn85/_new 2023-10-30 22:10:20.867248078 +0100
@@ -10,22 +10,22 @@
layers/CMakeLists.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-Index: Vulkan-ValidationLayers-sdk-1.3.261.0/layers/CMakeLists.txt
+Index: Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/CMakeLists.txt
===================================================================
---- Vulkan-ValidationLayers-sdk-1.3.261.0.orig/layers/CMakeLists.txt
-+++ Vulkan-ValidationLayers-sdk-1.3.261.0/layers/CMakeLists.txt
-@@ -25,8 +25,6 @@ target_sources(VkLayer_utils PRIVATE
- containers/custom_containers.h
- error_message/logging.h
- error_message/logging.cpp
+--- Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0.orig/layers/CMakeLists.txt
++++ Vulkan-ValidationLayers-vulkan-sdk-1.3.268.0/layers/CMakeLists.txt
+@@ -28,8 +28,6 @@ target_sources(VkLayer_utils PRIVATE
+ error_message/error_location.cpp
+ error_message/error_location.h
+ error_message/record_object.h
- external/xxhash.h
- external/xxhash.cpp
- ${API_TYPE}/generated/vk_function_pointers.cpp
- ${API_TYPE}/generated/vk_function_pointers.h
- ${API_TYPE}/generated/vk_format_utils.h
-@@ -70,6 +68,7 @@ target_compile_definitions(VkLayer_utils
- target_link_libraries(VkLayer_utils PUBLIC
- Vulkan::Headers
+ ${API_TYPE}/generated/error_location_helper.cpp
+ ${API_TYPE}/generated/error_location_helper.h
+ ${API_TYPE}/generated/pnext_chain_extraction.cpp
+@@ -76,6 +74,7 @@ target_link_libraries(VkLayer_utils PUBL
+ Vulkan::LayerSettings
+ Vulkan::UtilityHeaders
${CMAKE_DL_LIBS}
+ -lxxhash
)
1
0
Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package spirv-cross for openSUSE:Factory checked in at 2023-10-30 22:10:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spirv-cross (Old)
and /work/SRC/openSUSE:Factory/.spirv-cross.new.17445 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spirv-cross"
Mon Oct 30 22:10:06 2023 rev:13 rq:1120698 version:1.3.268.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/spirv-cross/spirv-cross.changes 2023-08-28 17:12:54.759689707 +0200
+++ /work/SRC/openSUSE:Factory/.spirv-cross.new.17445/spirv-cross.changes 2023-10-30 22:10:17.055107441 +0100
@@ -1,0 +2,7 @@
+Fri Oct 27 04:14:52 UTC 2023 - Jan Engelhardt <jengelh(a)inai.de>
+
+- Update to release SDK-1.3.268.0
+ * GLSL: Implement 64-bit image support.
+ * GLSL: Handle empty block declarations.
+
+-------------------------------------------------------------------
Old:
----
sdk-1.3.261.0.tar.gz
New:
----
vulkan-sdk-1.3.268.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spirv-cross.spec ++++++
--- /var/tmp/diff_new_pack.ogUW9W/_old 2023-10-30 22:10:17.767133709 +0100
+++ /var/tmp/diff_new_pack.ogUW9W/_new 2023-10-30 22:10:17.767133709 +0100
@@ -16,16 +16,16 @@
#
-%define _libpkg libspirv-cross-c-shared0
+%define lname libspirv-cross-c-shared0
%define __builder ninja
Name: spirv-cross
-Version: 1.3.261.0
+Version: 1.3.268.0
Release: 0
Summary: Tool and library for SPIR-V reflection and disassembly
License: Apache-2.0 OR MIT
Group: Development/Libraries/C and C++
URL: https://github.com/KhronosGroup/SPIRV-Cross
-Source0: https://github.com/KhronosGroup/SPIRV-Cross/archive/sdk-%version.tar.gz
+Source0: https://github.com/KhronosGroup/SPIRV-Cross/archive/vulkan-sdk-%version.tar…
BuildRequires: c++_compiler
BuildRequires: cmake >= 3
BuildRequires: ninja
@@ -44,28 +44,28 @@
* Support for "all" of vertex, fragment, tessellation, geometry
and compute shaders.
-%package -n %{_libpkg}
+%package -n %lname
Summary: Library for SPIR-V reflection and disassembly
Group: System/Libraries
-%description -n %{_libpkg}
+%description -n %lname
SPIRV-Cross is a tool and library designed for parsing and
converting SPIR-V to other shader languages.
%package devel
Summary: Development headers for the SPIRV-Cross library
Group: Development/Libraries/C and C++
-Requires: %{_libpkg} = %{version}-%{release}
-Obsoletes: libspirv-cross-c-shared-devel < %{version}-%{release}
-Provides: libspirv-cross-c-shared-devel = %{version}-%{release}
+Requires: %lname = %version-%release
+Obsoletes: libspirv-cross-c-shared-devel < %version-%release
+Provides: libspirv-cross-c-shared-devel = %version-%release
%description devel
SPIRV-Cross is a tool and library designed for parsing and
converting SPIR-V to other shader languages.
%prep
-%autosetup -p1 -n SPIRV-Cross-sdk-%{version}
-sed -i 's,${CMAKE_INSTALL_PREFIX}/lib,%{_libdir},;s,/share/pkgconfig,/%{_lib}/pkgconfig,;s,DESTINATION lib,DESTINATION %{_lib},g' CMakeLists.txt
+%autosetup -p1 -n SPIRV-Cross-vulkan-sdk-%version
+sed -i 's,$CMAKE_INSTALL_PREFIX/lib,%_libdir,;s,/share/pkgconfig,/%_lib/pkgconfig,;s,DESTINATION lib,DESTINATION %_lib,g' CMakeLists.txt
%build
%cmake \
@@ -81,21 +81,21 @@
ln -s "libspirv-cross-c-shared.so" "%buildroot/%_libdir/libspirv-cross-$i.so"
done
-%post -n %{_libpkg} -p /sbin/ldconfig
-%postun -n %{_libpkg} -p /sbin/ldconfig
+%post -n %lname -p /sbin/ldconfig
+%postun -n %lname -p /sbin/ldconfig
%files
%license LICENSE
%doc README.md
-%{_bindir}/spirv-cross
+%_bindir/spirv-cross
-%files -n %{_libpkg}
-%{_libdir}/libspirv-cross-c-shared.so.*
+%files -n %lname
+%_libdir/libspirv-cross-c-shared.so.*
%files devel
%_libdir/libspirv-cross-*.so
-%{_libdir}/pkgconfig/*.pc
-%{_includedir}/spirv_cross
+%_libdir/pkgconfig/*.pc
+%_includedir/spirv_cross
%dir %_datadir/spirv*
%_datadir/spirv*/cmake/
1
0