Hello community, here is the log from the commit of package paprefs for openSUSE:Factory checked in at 2018-10-11 11:51:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/paprefs (Old) and /work/SRC/openSUSE:Factory/.paprefs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "paprefs" Thu Oct 11 11:51:46 2018 rev:36 rq:640251 version:1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/paprefs/paprefs.changes 2018-06-29 22:23:37.354609003 +0200 +++ /work/SRC/openSUSE:Factory/.paprefs.new/paprefs.changes 2018-10-11 11:53:12.558194655 +0200 @@ -1,0 +2,11 @@ +Fri Oct 5 16:37:01 UTC 2018 - bjorn....@gmail.com + +- Update to version 1.0: + + Port to meson. +- Stop using source service, new stable release out. +- Add meson BuildRequires and corresponding macros following + upstreams port to meson. +- Drop intltool, libtool and lynx BuildRequires, no longer needed. +- Rebase paprefs-module-combine-sink.patch to upstream committed. + +------------------------------------------------------------------- Old: ---- _service _servicedata paprefs-0.9.10+20180501.534d20a.tar.xz New: ---- paprefs-1.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ paprefs.spec ++++++ --- /var/tmp/diff_new_pack.TEpSZc/_old 2018-10-11 11:53:14.262192488 +0200 +++ /var/tmp/diff_new_pack.TEpSZc/_new 2018-10-11 11:53:14.266192483 +0200 @@ -12,26 +12,24 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: paprefs -Version: 0.9.10+20180501.534d20a +Version: 1.0 Release: 0 Summary: PulseAudio Preferences License: GPL-2.0-or-later Group: Productivity/Multimedia/Sound/Utilities URL: http://freedesktop.org/software/pulseaudio/paprefs/ -#Source0: http://freedesktop.org/software/pulseaudio/paprefs/%%{name}-%%{version}.tar.xz -Source: %{name}-%{version}.tar.xz +Source0: http://freedesktop.org/software/pulseaudio/paprefs/%{name}-%{version}.tar.xz + # PATCH-FIX-UPSTREAM paprefs-module-combine-sink.patch bnc#820594 ohole...@suse.com -- use module-combine-sink instead of module-combine Patch0: paprefs-module-combine-sink.patch BuildRequires: gcc-c++ -BuildRequires: intltool -BuildRequires: libtool -BuildRequires: lynx +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-glib-1) @@ -56,12 +54,11 @@ %autosetup -p1 %build -NOCONFIGURE=1 ./bootstrap.sh -%configure -make %{?_smp_mflags} +%meson +%meson_build %install -%make_install +%meson_install %suse_update_desktop_file %{name} HardwareSettings AudioVideo Utility %find_lang %{name} %{?no_lang_C} @@ -75,7 +72,6 @@ %files %license LICENSE -%doc doc/README doc/README.html %{_bindir}/* %{_datadir}/paprefs %{_datadir}/applications/*.desktop ++++++ paprefs-0.9.10+20180501.534d20a.tar.xz -> paprefs-1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/.gitignore new/paprefs-1.0/.gitignore --- old/paprefs-0.9.10+20180501.534d20a/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/.gitignore 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1 @@ +build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/Makefile.am new/paprefs-1.0/Makefile.am --- old/paprefs-0.9.10+20180501.534d20a/Makefile.am 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,61 +0,0 @@ -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs 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. -# -# paprefs 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 paprefs. If not, see <http://www.gnu.org/licenses/>. - -EXTRA_DIST = \ - m4/ChangeLog \ - bootstrap.sh \ - README \ - LICENSE \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in - -SUBDIRS=src doc po - -MAINTAINERCLEANFILES=README -noinst_DATA = README - -README: - rm -f README - $(MAKE) -C doc README - cd $(srcdir) && ln -s doc/README README - -homepage: all dist - test -d $$HOME/homepage/private - mkdir -p $$HOME/homepage/private/projects/paprefs - cp paprefs-@package_vers...@.tar.gz $$HOME/homepage/private/projects/paprefs - cp doc/README.html doc/screenshot.png doc/style.css $$HOME/homepage/private/projects/paprefs - ln -sf README.html $$HOME/homepage/private/projects/paprefs/index.html - -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - -fedora-snapshot: dist - cp $(distdir).tar.gz $$HOME/cvs.fedora/paprefs/devel/$(distdir).svn`date +%Y%m%d`.tar.gz - -.PHONY: homepage - -ACLOCAL_AMFLAGS = -I m4 - -dist-hook: - if test -d .git ; then \ - git pull ; \ - chmod u+w ${distdir}/ChangeLog || true ; \ - git-changelog.perl > ${distdir}/ChangeLog ; \ - fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/autogen.sh new/paprefs-1.0/autogen.sh --- old/paprefs-0.9.10+20180501.534d20a/autogen.sh 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,24 +0,0 @@ -#!/bin/sh -# $Id$ - -# This file is part of paprefs. -# -# paprefs 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. -# -# paprefs 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 paprefs; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -# Only there to make jhbuild happy - -NOCONFIGURE=1 ./bootstrap.sh - -exec ./configure "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/bootstrap.sh new/paprefs-1.0/bootstrap.sh --- old/paprefs-0.9.10+20180501.534d20a/bootstrap.sh 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/bootstrap.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,67 +0,0 @@ -#!/bin/bash - -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs 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. -# -# paprefs 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 paprefs. If not, see <http://www.gnu.org/licenses/>. - -VERSION=1.9 - -run_versioned() { - local P - local V - - V=$(echo "$2" | sed -e 's,\.,,g') - - if [ -e "`which $1$V 2> /dev/null`" ] ; then - P="$1$V" - else - if [ -e "`which $1-$2 2> /dev/null`" ] ; then - P="$1-$2" - else - P="$1" - fi - fi - - shift 2 - "$P" "$@" -} - -set -ex - -if [ "x$1" = "xam" ] ; then - run_versioned automake "$VERSION" -a -c --foreign - ./config.status -else - rm -rf autom4te.cache - rm -f config.cache - - rm -f Makefile.am~ configure.ac~ - # Evil, evil, evil, evil hack - sed 's/read dummy/\#/' `which gettextize` | sh -s -- --copy --force - test -f Makefile.am~ && mv Makefile.am~ Makefile.am - test -f configure.ac~ && mv configure.ac~ configure.ac - - intltoolize --copy --force --automake - run_versioned aclocal "$VERSION" -I m4 - run_versioned autoconf 2.59 -Wall - run_versioned autoheader 2.59 - run_versioned automake "$VERSION" -a -c --foreign - - if test "x$NOCONFIGURE" = "x"; then - CFLAGS="-g -O0" ./configure --sysconfdir=/etc --localstatedir=/var "$@" - make clean - fi -fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/configure.ac new/paprefs-1.0/configure.ac --- old/paprefs-0.9.10+20180501.534d20a/configure.ac 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,93 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs 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. -# -# paprefs 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 paprefs. If not, see <http://www.gnu.org/licenses/>. - -AC_PREREQ(2.57) -AC_INIT([paprefs],[0.9.10],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org]) -AC_CONFIG_SRCDIR([src/paprefs.cc]) -AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall dist-xz tar-ustar]) - -AC_SUBST(PACKAGE_URL, [http://freedesktop.org/software/pulseaudio/paprefs/]) - -if type -p stow > /dev/null && test -d /usr/local/stow ; then - AC_MSG_NOTICE([*** Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ***]) - ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" -fi - -# Checks for programs. -AC_PROG_CXX -AC_PROG_CC -AC_PROG_LN_S -AC_TYPE_SIGNAL -AC_HEADER_STDC - -PKG_CHECK_MODULES(GUILIBS, [ gtkmm-3.0 sigc++-2.0 dbus-glib-1]) -AC_SUBST(GUILIBS_CFLAGS) -AC_SUBST(GUILIBS_LIBS) - -PKG_CHECK_MODULES(LIBPULSE, libpulse) -LIBPULSE_MODLIBEXECDIR=`pkg-config libpulse --variable modlibexecdir` -AC_SUBST(LIBPULSE_MODLIBEXECDIR) - -# If using GCC specifiy some additional parameters -if test "x$GCC" = "xyes" ; then - CFLAGS="$CFLAGS -pipe -Wall -W -Wno-unused-parameter" - CXXFLAGS="$CXXFLAGS -pipe -Wall -W" -fi - -# LYNX documentation generation -AC_ARG_ENABLE(lynx, - AS_HELP_STRING(--disable-lynx,Turn off lynx usage for documentation generation), -[case "${enableval}" in - yes) lynx=yes ;; - no) lynx=no ;; - *) AC_MSG_ERROR(bad value ${enableval} for --disable-lynx) ;; -esac],[lynx=yes]) - -if test x$lynx = xyes ; then - AC_CHECK_PROG(have_lynx, lynx, yes, no) - - if test x$have_lynx = xno ; then - AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***]) - fi -fi - -AM_CONDITIONAL([USE_LYNX], [test "x$lynx" = xyes]) - -#### GSettings support #### -PKG_CHECK_MODULES(GSETTINGS, [ giomm-2.4 >= 2.26 ]) -GLIB_GSETTINGS - -AM_GNU_GETTEXT([external]) - -IT_PROG_INTLTOOL([0.35.0]) -GETTEXT_PACKAGE=paprefs -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -AM_GLIB_GNU_GETTEXT - -AC_CONFIG_FILES([ -po/Makefile.in -Makefile -src/Makefile -doc/Makefile -doc/README.html]) - -AC_OUTPUT diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/doc/README.html.in new/paprefs-1.0/doc/README.html.in --- old/paprefs-0.9.10+20180501.534d20a/doc/README.html.in 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/doc/README.html.in 2018-07-29 18:28:07.000000000 +0200 @@ -10,8 +10,6 @@ <body> <h1><a name="top">PulseAudio Preferences @PACKAGE_VERSION@</a></h1> -<p><i>Copyright 2006-2009 Lennart Poettering <@PACKAGE_BUGREPORT@></i></p> - <ul class="toc"> <li><a href="#license">License</a></li> <li><a href="#news">News</a></li> @@ -20,8 +18,9 @@ <li><a href="#documentation">Documentation</a></li> <li><a href="#requirements">Requirements</a></li> <li><a href="#installation">Installation</a></li> - <li><a href="#acks">Acknowledgements</a></li> <li><a href="#download">Download</a></li> + <li><a href="#bugs">Bug Reports</a></li> + <li><a href="#patches">Contributing Code</a></li> </ul> <h2><a name="license">License</a></h2> @@ -38,6 +37,11 @@ <h2><a name="news">News</a></h2> +<div class="news-date">Sun Jul 29 2018: </div> <p class="news-text"><a +href="@package_...@paprefs-1.0.tar.xz">Version 1.0</a> released; replace GConf +with GSettings, port from GTK 2 to GTK 3, change build system from Autotools to +Meson, add support for fixed RTP port, add Croatian translation</p> + <div class="news-date">Tue Sep 27 2011: </div> <p class="news-text"><a href="@package_...@paprefs-0.9.10.tar.xz">Version 0.9.10</a> released; minor tidyups, should no longer require recompiling with each new PA version.</p> @@ -78,35 +82,25 @@ <h2><a name="requirements">Requirements</a></h2> -<p>Currently, <tt>paprefs</tt> is tested on Linux only.</p> - -<p><tt>paprefs</tt> was developed and tested on Debian GNU/Linux -"testing" from August 2006, it should work on most other Linux -distributions (and maybe Unix versions) since it uses GNU autoconf for -source code configuration.</p> +<p>Currently, <tt>paprefs</tt> is tested on Linux only. It should work on most +Linux distributions.</p> <p><tt>paprefs</tt> requires <a href="http://gtkmm.sf.net/";><tt>gtkmm</tt></a> and <tt>glademmm</tt> installed.</p> <p>Obviously <tt>paprefs</tt> requires an installation of <a -href="http://pulseaudio.org/";>PulseAudio</a> (version 12.0). The +href="http://pulseaudio.org/";>PulseAudio</a> (version 12.0 or newer). The module <tt>module-gsettings</tt> must be loaded in the daemon.</p> <p>There is an implicit dependency on PackageKit. If you don't install PackageKit the 'Install' buttons in the UI for installing necessary PulseAudio plugins won't work.</p> <h2><a name="installation">Installation</a></h2> -<p>As this package is made with the GNU autotools you should run -<tt>./configure</tt> inside the distribution directory for configuring -the source tree. After that you should run <tt>make</tt> for -compilation and <tt>make install</tt> (as root) for installation of +<p>As this package is made with the Meson you should run +<tt>meson build</tt> inside the distribution directory for configuring +the source tree. After that you should run <tt>ninja -C build</tt> for +compilation and <tt>ninja -C build install</tt> (as root) for installation of <tt>paprefs</tt>.</p> -<h2><a name="acks">Acknowledgements</a></h2> - -<p>Christian Persch for patches.</p> - -<p>Colin Guthrie for the RAOP support and other fixes.</p> - <h2><a name="download">Download</a></h2> <p>The newest release is always available from <a href="@PACKAGE_URL@">@PACKAGE_URL@</a></p> @@ -117,8 +111,13 @@ <pre>git clone git://anongit.freedesktop.org/pulseaudio/paprefs</pre> -<hr/> -<address class="grey">Lennart Poettering <@PACKAGE_BUGREPORT@>, September 2009</address> +<h2><a name="bugs">Bug Reports</a></h2> + +<p>Bugs can be reported on the freedesktop.org bug tracker: <a href="https://bugs.freedesktop.org/enter_bug.cgi?product=PulseAudio";>https://bugs.freedesktop.org/enter_bug.cgi?product=PulseAudio</a>. You need to report your bugs against PulseAudio, because there's no separate product on the bug tracker for paprefs.</p> + +<h2><a name="patches">Contributing Code</a></h2> + +<p>If you have patches for paprefs, send them to the <a href="https://lists.freedesktop.org/mailman/listinfo/pulseaudio-discuss";>PulseAudio mailing list</a> (requires subscription). The best (but not mandatory) way to send patches is with the <tt>git send-email</tt> tool. Here are some <a href="https://www.freedesktop.org/wiki/Software/PulseAudio/HowToUseGitSendEmail/";>instructions for git send-email</a>.</p> </body> </html> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/doc/html2txt new/paprefs-1.0/doc/html2txt --- old/paprefs-0.9.10+20180501.534d20a/doc/html2txt 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/doc/html2txt 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1,2 @@ +#!/bin/sh +lynx --dump $1 | sed 's,file://localhost/.*/doc/README.html,README,' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/doc/meson.build new/paprefs-1.0/doc/meson.build --- old/paprefs-0.9.10+20180501.534d20a/doc/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/doc/meson.build 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1,25 @@ +doc_conf = configuration_data() +doc_conf.set('PACKAGE_VERSION', meson.project_version()) +doc_conf.set('PACKAGE_BUGREPORT', mailing_list) +doc_conf.set('PACKAGE_URL', homepage) + +readme_html = configure_file( + input: 'README.html.in', + output: 'README.html', + configuration: doc_conf, +) + +if tidy.found() + test('XHTML documentation uses correct mark-up', tidy, args: ['-e', readme_html]) +endif + +if with_lynx + custom_target( + 'README', + input: readme_html, + output: 'README', + command: [find_program('./html2txt'), '@INPUT@'], + capture: true, + build_by_default: true, + ) +endif Binary files old/paprefs-0.9.10+20180501.534d20a/doc/screenshot.png and new/paprefs-1.0/doc/screenshot.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/meson.build new/paprefs-1.0/meson.build --- old/paprefs-0.9.10+20180501.534d20a/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/meson.build 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1,52 @@ +project('paprefs', 'cpp', + license: 'GPL2+', + version: '1.0', + meson_version: '>=0.40.1' +) + +mailing_list = 'pulseaudio-discuss (at) lists (dot) freedesktop (dot) org' +homepage = 'http://freedesktop.org/software/pulseaudio/paprefs/' + +with_lynx = get_option('lynx') + +i18n = import('i18n') + +gtkmm = dependency('gtkmm-3.0') +giomm = dependency('giomm-2.4', version: '>= 2.26') +sigc = dependency('sigc++-2.0') +dbus_glib = dependency('dbus-glib-1') +libpulse = dependency('libpulse') + +lynx = find_program('lynx', required: with_lynx) +tidy = find_program('tidy', required: false) + +prefix = get_option('prefix') +bindir = join_paths(prefix, get_option('bindir')) +localedir = join_paths(prefix, get_option('localedir')) +datadir = join_paths(prefix, get_option('datadir')) +pkgdatadir = join_paths(datadir, meson.project_name()) + +conf = configuration_data() + +conf.set_quoted('GETTEXT_PACKAGE', meson.project_name()) +conf.set_quoted('GLADE_FILE', join_paths(pkgdatadir, 'paprefs.glade')) +conf.set_quoted('LOCALEDIR', localedir) +conf.set_quoted('MODDIR', libpulse.get_pkgconfig_variable('modlibexecdir')) +# Needs fixing on some borked OS +conf.set_quoted('SHREXT', '.so') + +configure_file( + output : 'config.h', + configuration : conf +) + +common_flags = [ + '-DHAVE_CONFIG_H', +] +add_project_arguments(common_flags, language: 'cpp') + +configuration_inc = include_directories('.') + +subdir('src') +subdir('po') +subdir('doc') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/meson_options.txt new/paprefs-1.0/meson_options.txt --- old/paprefs-0.9.10+20180501.534d20a/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/meson_options.txt 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1 @@ +option('lynx', type: 'boolean', value: false, description: 'enable documentation generation (using lynx)') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/po/meson.build new/paprefs-1.0/po/meson.build --- old/paprefs-0.9.10+20180501.534d20a/po/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/po/meson.build 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1,4 @@ +i18n.gettext( + meson.project_name(), + preset: 'glib', + ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/src/Makefile.am new/paprefs-1.0/src/Makefile.am --- old/paprefs-0.9.10+20180501.534d20a/src/Makefile.am 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/src/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,42 +0,0 @@ -# This file is part of paprefs. -# -# Copyright 2006-2008 Lennart Poettering -# -# paprefs 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. -# -# paprefs 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 paprefs. If not, see <http://www.gnu.org/licenses/>. - -# Needs fixing on some borked OS -SHREXT=.so - -desktopdir = $(datadir)/applications -gladedir = $(pkgdatadir) -localedir = $(datadir)/locale - -bin_PROGRAMS=paprefs -glade_DATA=paprefs.glade -desktop_in_files=paprefs.desktop.in -desktop_DATA=$(desktop_in_files:.desktop.in=.desktop) - -paprefs_SOURCES=paprefs.cc - -paprefs_LDADD=$(AM_LDADD) $(GUILIBS_LIBS) $(LIBPULSE_LIBS) -paprefs_CXXFLAGS=$(AM_CXXFLAGS) $(GUILIBS_CFLAGS) $(LIBPULSE_CFLAGS) $(GSETTINGS_CFLAGS) -paprefs_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/paprefs.glade\" -DLOCALEDIR=\"$(localedir)\" -DMODDIR=\""$(LIBPULSE_MODLIBEXECDIR)"\" -DSHREXT=\"$(SHREXT)\" - -@GSETTINGS_RULES@ - -EXTRA_DIST = $(glade_DATA) $(desktop_in_files) - -CLEANFILES = $(desktop_DATA) - -@INTLTOOL_DESKTOP_RULE@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/src/meson.build new/paprefs-1.0/src/meson.build --- old/paprefs-0.9.10+20180501.534d20a/src/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/paprefs-1.0/src/meson.build 2018-07-29 18:28:07.000000000 +0200 @@ -0,0 +1,33 @@ +paprefs_sources = [ + 'paprefs.cc', +] + +paprefs_dependencies = [ + giomm, + gtkmm, + sigc, + dbus_glib, + libpulse, +] + +executable( + 'paprefs', + paprefs_sources, + include_directories: configuration_inc, + dependencies: paprefs_dependencies, + install: true, +) + +desktop_file = i18n.merge_file( + input: 'paprefs.desktop.in', + output: 'paprefs.desktop', + type: 'desktop', + po_dir: '../po', + install: true, + install_dir: join_paths(datadir, 'applications'), +) + +install_data( + 'paprefs.glade', + install_dir: join_paths(pkgdatadir), +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/paprefs-0.9.10+20180501.534d20a/src/paprefs.desktop.in new/paprefs-1.0/src/paprefs.desktop.in --- old/paprefs-0.9.10+20180501.534d20a/src/paprefs.desktop.in 2018-05-01 17:12:53.000000000 +0200 +++ new/paprefs-1.0/src/paprefs.desktop.in 2018-07-29 18:28:07.000000000 +0200 @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 Encoding=UTF-8 -_Name=PulseAudio Preferences -_GenericName=Sound Server Preferences -_Comment=View and modify the configuration of the local sound server +Name=PulseAudio Preferences +GenericName=Sound Server Preferences +Comment=View and modify the configuration of the local sound server Exec=paprefs Icon=preferences-desktop StartupNotify=true ++++++ paprefs-module-combine-sink.patch ++++++ --- /var/tmp/diff_new_pack.TEpSZc/_old 2018-10-11 11:53:14.342192387 +0200 +++ /var/tmp/diff_new_pack.TEpSZc/_new 2018-10-11 11:53:14.346192381 +0200 @@ -1,6 +1,18 @@ ---- paprefs/src/paprefs.cc 2018-06-04 12:12:39.191970557 +0200 -+++ paprefs-0.9.10+20180501.534d20a/src/paprefs.cc 2018-06-04 12:23:32.321115639 +0200 -@@ -420,7 +420,7 @@ +From 89e9e00cab69cb6482d109668a595802613fd0d7 Mon Sep 17 00:00:00 2001 +From: Julian Sikorski <beleg...@fedoraproject.org> +Date: Mon, 30 Jul 2018 19:37:28 +0200 +Subject: Use module-combine-sink instead of module-combine + +https://bugzilla.redhat.com/show_bug.cgi?id=969534 +--- + src/paprefs.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/paprefs.cc b/src/paprefs.cc +index 2b1d389..af6d885 100644 +--- a/src/paprefs.cc ++++ b/src/paprefs.cc +@@ -415,7 +415,7 @@ void MainWindow::writeToGSettingsCombine() { combineSettings->delay(); if (combineCheckButton->get_active()) { @@ -9,3 +21,6 @@ combineSettings->set_string("args0", Glib::ustring("")); combineSettings->set_boolean("enabled", true); +-- +cgit v1.1 +
