From 47a7c69640e2ed4ea1f33dcbf1f0aef0abc931a7 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:57:54 -0700 Subject: [PATCH 01/10] shotwell: remove unused dependency on libunique https://gitlab.gnome.org/GNOME/shotwell/-/commit/7c2e51d3bbf9457d4dd37c60e3f59055c3923cbf --- srcpkgs/shotwell/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/shotwell/template b/srcpkgs/shotwell/template index 386644d4939e..fa533f27b167 100644 --- a/srcpkgs/shotwell/template +++ b/srcpkgs/shotwell/template @@ -8,7 +8,7 @@ hostmakedepends="gcr-devel gettext glib-devel itstool makedepends="gst-plugins-base1-devel libgdata-devel libgee08-devel libgexiv2-devel libgphoto2-devel libgudev-devel libraw-devel libsecret-devel libchamplain-devel libwebp-devel - libunique-devel rest-devel vala-devel webkit2gtk-devel" + rest-devel vala-devel webkit2gtk-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="Open source photo manager for GNOME" maintainer="Enno Boland " From 41a2ba3fc302a8d78dcbcbc5ebab9a99b63e5244 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:55:05 -0700 Subject: [PATCH 02/10] gnac: remove package Unmaintained, last release was in 2012. --- srcpkgs/gnac/patches/cflags.patch | 19 - srcpkgs/gnac/patches/fix-build.patch | 25 - srcpkgs/gnac/patches/fix-debug-log.patch | 29 - srcpkgs/gnac/patches/gstreamer-1.0.patch | 1648 ----------------- srcpkgs/gnac/patches/no-gnome-doc-utils.patch | 20 - srcpkgs/gnac/patches/no-po-check.patch | 7 - srcpkgs/gnac/template | 26 - srcpkgs/removed-packages/template | 1 + 8 files changed, 1 insertion(+), 1774 deletions(-) delete mode 100644 srcpkgs/gnac/patches/cflags.patch delete mode 100644 srcpkgs/gnac/patches/fix-build.patch delete mode 100644 srcpkgs/gnac/patches/fix-debug-log.patch delete mode 100644 srcpkgs/gnac/patches/gstreamer-1.0.patch delete mode 100644 srcpkgs/gnac/patches/no-gnome-doc-utils.patch delete mode 100644 srcpkgs/gnac/patches/no-po-check.patch delete mode 100644 srcpkgs/gnac/template diff --git a/srcpkgs/gnac/patches/cflags.patch b/srcpkgs/gnac/patches/cflags.patch deleted file mode 100644 index 68a00b62eba0..000000000000 --- a/srcpkgs/gnac/patches/cflags.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- gnac-0.2.4.1/configure.ac.orig -+++ gnac-0.2.4.1/configure.ac -@@ -122,16 +122,6 @@ - AC_SUBST(DISABLE_DEPRECATED) - fi - --# debug support --AC_ARG_ENABLE([debug], [], --[ if test "$enableval" = "yes"; then -- CFLAGS="-g -ggdb -O0" -- else -- CFLAGS="-O2" -- fi -- AC_SUBST([CFLAGS]) -- ]) -- - AC_SUBST([AM_CPPFLAGS]) - AC_SUBST([AM_CFLAGS]) - AC_SUBST([AM_LDFLAGS]) diff --git a/srcpkgs/gnac/patches/fix-build.patch b/srcpkgs/gnac/patches/fix-build.patch deleted file mode 100644 index 6dc76c2b7dd3..000000000000 --- a/srcpkgs/gnac/patches/fix-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 46c37c04967c06d1f8ded3b40161b9d9fcb8ff8d Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Fri, 19 Jun 2015 09:14:14 +0200 -Subject: libgnac-debug.h: fix typo (critial vs critical) - ---- - libgnac/libgnac-debug.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgnac/libgnac-debug.h b/libgnac/libgnac-debug.h -index 3f2705d..087e251 100644 ---- a/libgnac/libgnac-debug.h -+++ b/libgnac/libgnac-debug.h -@@ -52,7 +52,7 @@ - - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - #define libgnac_critical(...) \ -- libgnac_critial_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) -+ libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) - #elif defined(__GNUC__) && __GNUC__ >= 3 - #define libgnac_critical(...) \ - libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) --- -cgit v0.12 - diff --git a/srcpkgs/gnac/patches/fix-debug-log.patch b/srcpkgs/gnac/patches/fix-debug-log.patch deleted file mode 100644 index 88fd15de6a56..000000000000 --- a/srcpkgs/gnac/patches/fix-debug-log.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/libgnac/libgnac-debug.h -+++ b/libgnac/libgnac-debug.h -@@ -32,7 +32,7 @@ - - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - #define libgnac_debug(...) \ -- libgnac_debug_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) -+ libgnac_debug_real (__func__, __FILE__, __LINE__, __VA_ARGS__) - #elif defined(__GNUC__) && __GNUC__ >= 3 - #define libgnac_debug(...) \ - libgnac_debug_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) -@@ -42,7 +42,7 @@ - - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - #define libgnac_warning(...) \ -- libgnac_warning_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) -+ libgnac_warning_real (__func__, __FILE__, __LINE__, __VA_ARGS__) - #elif defined(__GNUC__) && __GNUC__ >= 3 - #define libgnac_warning(...) \ - libgnac_warning_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) -@@ -52,7 +52,7 @@ - - #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L - #define libgnac_critical(...) \ -- libgnac_critical_real (__func__, __FILE__, __LINE__, TRUE, __VA_ARGS__) -+ libgnac_critical_real (__func__, __FILE__, __LINE__, __VA_ARGS__) - #elif defined(__GNUC__) && __GNUC__ >= 3 - #define libgnac_critical(...) \ - libgnac_critical_real (__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) diff --git a/srcpkgs/gnac/patches/gstreamer-1.0.patch b/srcpkgs/gnac/patches/gstreamer-1.0.patch deleted file mode 100644 index ad46c0a47b21..000000000000 --- a/srcpkgs/gnac/patches/gstreamer-1.0.patch +++ /dev/null @@ -1,1648 +0,0 @@ -diff -Naur gnac-0.2.4.1.orig/configure.ac gnac-0.2.4.1/configure.ac ---- gnac-0.2.4.1.orig/configure.ac 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/configure.ac 2015-01-09 23:55:03.296384170 +0100 -@@ -93,21 +93,21 @@ - dnl Find the GStreamer libraries - GSTREAMER_REQUIRED_VERSION=0.10.31 - PKG_CHECK_MODULES(GSTREAMER, [ -- gstreamer-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-pbutils-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-plugins-base-0.10 >= $GSTREAMER_REQUIRED_VERSION -- gstreamer-tag-0.10 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-pbutils-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-plugins-base-1.0 >= $GSTREAMER_REQUIRED_VERSION -+ gstreamer-tag-1.0 >= $GSTREAMER_REQUIRED_VERSION - ]) - AC_SUBST(GSTREAMER_CFLAGS) - AC_SUBST(GSTREAMER_LIBS) - - dnl Find the GStreamer elements we use, and warn if they are not present --AM_GST_ELEMENT_CHECK(faac, , AC_MSG_WARN([The 'faac' element was not found. This will cause encoding to AAC to fail.])) --AM_GST_ELEMENT_CHECK(flacenc, , AC_MSG_WARN([The 'flacenc' element was not found. This will cause encoding to FLAC to fail.])) --AM_GST_ELEMENT_CHECK(lame, , AC_MSG_WARN([The 'lame' element was not found. This will cause encoding to MP3 to fail.])) --AM_GST_ELEMENT_CHECK(wavenc, , AC_MSG_WARN([The 'wavenc' element was not found. This will cause encoding to WAV to fail.])) --AM_GST_ELEMENT_CHECK(wavpackenc, , AC_MSG_WARN([The 'wavpackenc' element was not found. This will cause encoding to WAVPACK to fail.])) -+GST_ELEMENT_CHECK(faac, 1.0, , AC_MSG_WARN([The 'faac' element was not found. This will cause encoding to AAC to fail.])) -+GST_ELEMENT_CHECK(flacenc, 1.0, , AC_MSG_WARN([The 'flacenc' element was not found. This will cause encoding to FLAC to fail.])) -+GST_ELEMENT_CHECK(lamemp3enc, 1.0, , AC_MSG_WARN([The 'lamemp3enc' element was not found. This will cause encoding to MP3 to fail.])) -+GST_ELEMENT_CHECK(wavenc, 1.0, , AC_MSG_WARN([The 'wavenc' element was not found. This will cause encoding to WAV to fail.])) -+GST_ELEMENT_CHECK(wavpackenc, 1.0, , AC_MSG_WARN([The 'wavpackenc' element was not found. This will cause encoding to WAVPACK to fail.])) - - dnl Optionnaly enable G* deprecations - AC_MSG_CHECKING([Wether to enable deprecation warnings]) -diff -Naur gnac-0.2.4.1.orig/data/profiles/aac.xml.in gnac-0.2.4.1/data/profiles/aac.xml.in ---- gnac-0.2.4.1.orig/data/profiles/aac.xml.in 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/aac.xml.in 2015-01-09 23:49:31.329712534 +0100 -@@ -11,8 +11,8 @@ - - faac - -- ... -- -+ ... -+ - - Bitrate - bitrate -@@ -37,33 +37,12 @@ - 320 Kbps - - -- -- Profile -- <_description>AAC takes a modular approach to encoding. There are four default profiles using different tools: (LC) -> the simplest and most widely used and supported; (MAIN) -> like the LC profile, with the addition of backwards prediction; (SRS) -> a.k.a. Scalable Sample Rate (MPEG-4 AAC-SSR); (LTP) -> an improvement of the MAIN profile using a forward predictor with lower computational complexity. -- profile -- 1 -- -- Main (MAIN) -- Low complexity (LC) -- Scalable sampling rate (SSR) -- Long term prediction (LTP) -- -- -- -+ - Temporal noise shaping - <_description>Conventional transform coding schemes often encounter problems with signals that vary heavily over time, especially speech signals. Temporal noise shaping can be viewed as a postprocessing step which goal is to overcome this limitation. - tns - false - -- -- Output format -- outputformat -- 1 -- -- <_value value="1">ADTS headers -- <_value value="0">Raw AAC -- -- - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/base.xml.in gnac-0.2.4.1/data/profiles/base.xml.in ---- gnac-0.2.4.1.orig/data/profiles/base.xml.in 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/base.xml.in 2015-01-09 23:49:31.329712534 +0100 -@@ -21,7 +21,7 @@ - - - -- audio/x-raw-int -+ audio/x-raw - audioconvert - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_AAC.xml.in gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_AAC.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in 2015-01-10 01:03:29.951986568 +0100 -@@ -8,12 +8,10 @@ - <_description>Used for converting to CD-quality audio, but with the lossy AAC codec. Use this for preparing files for copying to devices that only support the AAC codec. Note that using this format may be illegal in your jurisdiction; contact your lawyer for advice. - 2 - 44100 -- audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! faac bitrate=128000 outputformat=1 -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! faac bitrate=128000 ! audio/mpeg, mpegversion=4, stream-format=adts ! aacparse - - - 128000 -- 1 -- 1 - false - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_Lossless.xml.in gnac-0.2.4.1/data/profiles/default/CD_Quality,_Lossless.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_Lossless.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/CD_Quality,_Lossless.xml.in 2015-01-09 23:49:31.329712534 +0100 -@@ -8,7 +8,7 @@ - <_description>Used for converting to CD-quality audio, but with a lossless compression codec. Use this if you later want to edit the file or burn it to CD. - 2 - 44100 -- audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! flacenc name=enc quality=5 -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! flacenc name=enc quality=5 - - - 5 -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_Lossy.xml.in gnac-0.2.4.1/data/profiles/default/CD_Quality,_Lossy.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_Lossy.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/CD_Quality,_Lossy.xml.in 2015-01-09 23:49:31.333045887 +0100 -@@ -8,7 +8,7 @@ - <_description>Used for converting to CD-quality audio, but with a lossy compression codec. Use this for CD extraction and radio recordings. - 2 - 44100 -- audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! vorbisenc name=enc quality=0.5 ! oggmux -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! vorbisenc name=enc quality=0.5 ! oggmux - - - 0.5 -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_MP3.xml.in gnac-0.2.4.1/data/profiles/default/CD_Quality,_MP3.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/CD_Quality,_MP3.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/CD_Quality,_MP3.xml.in 2015-01-09 23:49:31.333045887 +0100 -@@ -8,18 +8,12 @@ - <_description>Used for converting to CD-quality audio, but with the lossy MP3 codec. Use this for preparing files for copying to devices that only support the MP3 codec. Note that using this format may be illegal in your jurisdiction; contact your lawyer for advice. - 2 - 44100 -- audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! lame name=enc mode=4 vbr=4 vbr-quality=6 ! xingmux ! id3v2mux -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! lamemp3enc name=enc target=quality quality=4 ! xingmux ! id3v2mux - - -- 4 -+ quality - -- 6 -- -- -- -- -- -- -- 4 -+ 4 -+ - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/Voice,_Lossless.xml.in gnac-0.2.4.1/data/profiles/default/Voice,_Lossless.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/Voice,_Lossless.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/Voice,_Lossless.xml.in 2015-01-09 23:49:31.333045887 +0100 -@@ -8,7 +8,7 @@ - <_description>Used for converting to lossless voice-quality audio. Use this for recording and editing speech. - 2 - 44100 -- audioconvert ! audio/x-raw-int, rate=44100, channels=2 ! audioconvert ! wavenc name=enc -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! wavenc name=enc - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/default/Voice,_Lossy.xml.in gnac-0.2.4.1/data/profiles/default/Voice,_Lossy.xml.in ---- gnac-0.2.4.1.orig/data/profiles/default/Voice,_Lossy.xml.in 2012-01-25 17:27:37.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/default/Voice,_Lossy.xml.in 2015-01-09 23:49:31.333045887 +0100 -@@ -8,7 +8,7 @@ - <_description>Used for converting to lossy voice-quality audio. Use this for recording speech that doesn't need to be edited. - 2 - 44100 -- audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! speexenc name=enc quality=8 vad=false mode=0 ! oggmux -+ audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert ! speexenc name=enc quality=8 vad=false mode=0 ! oggmux - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/mp3-lame.xml.in gnac-0.2.4.1/data/profiles/mp3-lame.xml.in ---- gnac-0.2.4.1.orig/data/profiles/mp3-lame.xml.in 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/data/profiles/mp3-lame.xml.in 2015-01-09 23:49:31.333045887 +0100 -@@ -13,58 +13,27 @@ - application/x-id3 - audio/x-mp3 - -- lame name=enc -+ lamemp3enc name=enc - - Add Xing header - Add id3v2 header - -- -- Preset -- preset -- 1006 -- -- <_value value="1006">Medium -- <_value value="1001">Standard -- <_value value="1002">Extreme -- <_value value="1003">Insane -- -- -- -- Bitrate mode -- vbr -+ -+ Target -+ target - 0 - -- <_value value="0">Constant bitrate (CBR) -- <_value value="3">Average bitrate (ABR) -- <_value value="4">Variable bitrate (VBR) -- <_value value="5">Presets -- <_value value="6">Compression ratio -+ <_value value="quality">Quality -+ <_value value="bitrate">Bitrate - - - - VBR quality -- vbr-quality -+ quality - 0.0 -- 9.0 -+ 10.0 - 1.0 -- 3.0 -- -- -- Compression ratio -- <_description>Let lame choose bitrate to achieve selected compression ratio. -- compression-ratio -- 0.0 -- 200 -- 1.0 -- 0.0 -- -- -- VBR mean bitrate -- vbr-mean-bitrate -- 0.0 -- 330.0 -- 1.0 -- 192 -+ 4.0 - - - Bitrate -@@ -90,64 +59,13 @@ - 320 Kbps - - -- -- VBR minimum bitrate -- vbr-min-bitrate -- 128 -- -- 8 Kbps -- 16 Kbps -- 24 Kbps -- 32 Kbps -- 40 Kbps -- 48 Kbps -- 56 Kbps -- 64 Kbps -- 80 Kbps -- 96 Kbps -- 112 Kbps -- 128 Kbps -- 160 Kbps -- 192 Kbps -- 224 Kbps -- 256 Kbps -- 320 Kbps -- -- -- -- VBR maximum bitrate -- vbr-max-bitrate -- 128 -- -- 8 Kbps -- 16 Kbps -- 24 Kbps -- 32 Kbps -- 40 Kbps -- 48 Kbps -- 56 Kbps -- 64 Kbps -- 80 Kbps -- 96 Kbps -- 112 Kbps -- 128 Kbps -- 160 Kbps -- 192 Kbps -- 224 Kbps -- 256 Kbps -- 320 Kbps -- -- -- -+ - Mode -- mode -- 4 -+ mono -+ 0 - -- <_value value="0">Stereo -- <_value value="1">Joint Stereo -- <_value value="2">Dual Channel -- <_value value="3">Mono -- <_value value="4">Auto -+ <_value value="0">Auto -+ <_value value="1">Mono - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-aac.xml gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml ---- gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-aac.xml 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml 2015-01-09 23:49:31.333045887 +0100 -@@ -1,6 +1,7 @@ - -+ - -- -+ - - True - False -@@ -26,84 +27,6 @@ - 5 - 10 - -- -- True -- False -- 0 -- Output format -- -- -- 0 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Profile -- -- -- 0 -- 1 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 1 -- 1 -- 1 -- -- -- - - Temporal noise shaping - False -@@ -111,16 +34,14 @@ - True - False - True -- False - 0 - True - - - - 0 -- 2 -+ 1 - 2 -- 1 - - - -@@ -146,7 +67,6 @@ - 0 - 1 - 2 -- 1 - - - -@@ -170,8 +90,6 @@ - - 1 - 0 -- 1 -- 1 - - - -@@ -184,8 +102,6 @@ - - 0 - 0 -- 1 -- 1 - - - -diff -Naur gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-lame.xml gnac-0.2.4.1/data/profiles/ui/gnac-profiles-lame.xml ---- gnac-0.2.4.1.orig/data/profiles/ui/gnac-profiles-lame.xml 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/data/profiles/ui/gnac-profiles-lame.xml 2015-01-09 23:49:31.336379238 +0100 -@@ -1,6 +1,7 @@ - -+ - -- -+ - - 100 - 1 -@@ -10,9 +11,6 @@ - - 1 - -- -- 1 -- - - True - False -@@ -44,7 +42,7 @@ - True - False - -- -+ - True - False - -@@ -60,8 +58,6 @@ - - 1 - 1 -- 1 -- 1 - - - -@@ -74,133 +70,6 @@ - - 0 - 1 -- 1 -- 1 -- -- -- -- -- Mean bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 2 -- 1 -- 1 -- -- -- -- -- Min bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 3 -- 1 -- 1 -- -- -- -- -- Max bitrate -- False -- True -- True -- False -- False -- 0 -- True -- -- -- -- 0 -- 4 -- 1 -- 1 -- -- -- -- -- True -- False -- True -- adjustment1 -- 0 -- -- -- -- 1 -- 2 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 4 -- 1 -- 1 - - - -@@ -223,9 +92,8 @@ - - - 0 -- 6 -+ 3 - 2 -- 1 - - - -@@ -233,10 +101,10 @@ - True - False - -- -+ - True - False -- -+ - - - False -@@ -249,8 +117,6 @@ - - 1 - 0 -- 1 -- 1 - - - -@@ -274,47 +140,6 @@ - - 1 - 1 -- 1 -- 1 -- -- -- -- -- True -- False -- -- -- True -- False -- -- -- -- False -- False -- end -- 0 -- -- -- -- -- 1 -- 3 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Preset -- -- -- 0 -- 3 -- 1 -- 1 - - - -@@ -327,8 +152,6 @@ - - 0 - 2 -- 1 -- 1 - - - -@@ -336,13 +159,11 @@ - True - False - 0 -- Constant bitrate (CBR) -+ Bitrate - - - 0 - 1 -- 1 -- 1 - - - -@@ -350,13 +171,11 @@ - True - False - 0 -- Encoding mode -+ Target - - - 0 - 0 -- 1 -- 1 - - - -@@ -414,69 +233,12 @@ - - 1 - 2 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Average bitrate (ABR) -- -- -- 0 -- 4 -- 1 -- 1 -- -- -- -- -- True -- True -- adjustment1 -- 0 -- -- -- -- 1 -- 4 -- 1 -- 1 -- -- -- -- -- True -- False -- 0 -- Compression ratio -- -- -- 0 -- 5 -- 1 -- 1 -- -- -- -- -- True -- True -- adjustment3 -- 0 -- -- -- -- 1 -- 5 -- 1 -- 1 - - - - - -+ -+ 1 -+ - -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-converter.c gnac-0.2.4.1/libgnac/libgnac-converter.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-converter.c 2012-03-22 16:50:45.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-converter.c 2015-01-09 23:49:31.336379238 +0100 -@@ -1000,13 +1000,13 @@ - gint64 pos; - static GstFormat format = GST_FORMAT_TIME; - -- if (gst_element_query_position(item->pipeline, &format, &pos)) { -+ if (gst_element_query_position(item->pipeline, format, &pos)) { - if (pos != item->pos) { - gint64 len; - gfloat result = 0.0f; - guint64 time_left = 0; - -- if (gst_element_query_duration(item->pipeline, &format, &len)) { -+ if (gst_element_query_duration(item->pipeline, format, &len)) { - gfloat processed = priv->elapsed_duration + ((pos - len) / GST_SECOND); - result = CLAMP(processed / priv->total_duration, 0.0f, 1.0f); - /* XXX this is a workaround to prevent the remaining time -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-error.c gnac-0.2.4.1/libgnac/libgnac-error.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-error.c 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-error.c 2015-01-09 23:49:31.336379238 +0100 -@@ -52,7 +52,7 @@ - gst_message_unref(msg); - if (!detail) return; - -- gchar *details[] = { detail, NULL }; -+ const gchar *details[] = { detail, NULL }; - GstInstallPluginsReturn ret = gst_install_plugins_async(details, NULL, - libgnac_converter_missing_plugin_result_cb, item->parent); - g_free(detail); -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-gst.c gnac-0.2.4.1/libgnac/libgnac-gst.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-gst.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/libgnac/libgnac-gst.c 2015-01-09 23:49:31.336379238 +0100 -@@ -223,7 +223,7 @@ - - /* decodebin */ - GstElement *decodebin = libgnac_gstu_make_pipeline_element(item->pipeline, -- "decodebin2", NULL, &err); -+ "decodebin", NULL, &err); - if (err) { - g_propagate_error(error, err); - return; -@@ -382,7 +382,7 @@ - gpointer data) - { - LibgnacMediaItem *item = (LibgnacMediaItem *) data; -- GstCaps *caps = gst_pad_get_caps(pad); -+ GstCaps *caps = gst_pad_query_caps(pad, NULL); - - if (gst_caps_is_empty(caps) || gst_caps_is_any(caps)) { - libgnac_debug("Got a bad caps: %s", gst_caps_to_string(caps)); -diff -Naur gnac-0.2.4.1.orig/libgnac/libgnac-metadata.c gnac-0.2.4.1/libgnac/libgnac-metadata.c ---- gnac-0.2.4.1.orig/libgnac/libgnac-metadata.c 2012-03-27 15:51:09.000000000 +0200 -+++ gnac-0.2.4.1/libgnac/libgnac-metadata.c 2015-01-10 00:34:27.564874078 +0100 -@@ -209,11 +209,14 @@ - GstBuffer *buffer = gst_value_get_buffer(val); - g_return_if_fail(buffer); - -+ GstSample *sample = gst_value_get_sample(val); -+ g_return_if_fail(sample); -+ - gint image_type = GST_TAG_IMAGE_TYPE_NONE; - - /* GST_TAG_PREVIEW_IMAGE does not have an "image-type" field */ - if (g_str_equal(tag_name, GST_TAG_IMAGE)) { -- GstCaps *caps = GST_BUFFER_CAPS(buffer); -+ GstCaps *caps = gst_sample_get_caps(sample); - g_return_if_fail(caps); - - GstStructure *structure = gst_caps_get_structure(caps, 0); -@@ -231,8 +234,11 @@ - { - GdkPixbufLoader *loader = gdk_pixbuf_loader_new(); - GError *error = NULL; -- guint8 *data = GST_BUFFER_DATA(buffer); -- guint size = GST_BUFFER_SIZE(buffer); -+ GstMapInfo *info = NULL; -+ gst_buffer_map(buffer, info, GST_MAP_READ); -+ guint8 *data = info->data; -+ guint size = info->size; -+ gst_buffer_unmap(buffer, info); - - if (!gdk_pixbuf_loader_write(loader, data, size, &error)) { - libgnac_debug("Error writing data to pixbuf: %s", error->message); -@@ -297,8 +303,8 @@ - - if (g_str_equal(tag_name, GST_TAG_DATE)) - { -- g_return_if_fail(GST_VALUE_HOLDS_DATE(newval)); -- const GDate *date = gst_value_get_date(newval); -+ g_return_if_fail(G_VALUE_HOLDS(newval,G_TYPE_DATE)); -+ const GDate *date = g_value_get_boxed(newval); - if (!date) return; - GDateYear year = g_date_get_year(date); - g_value_unset(newval); -diff -Naur gnac-0.2.4.1.orig/src/gnac-options.c gnac-0.2.4.1/src/gnac-options.c ---- gnac-0.2.4.1.orig/src/gnac-options.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/gnac-options.c 2015-01-09 23:49:31.339712589 +0100 -@@ -27,6 +27,7 @@ - #include "config.h" - #endif - -+#include - #include - #include - -diff -Naur gnac-0.2.4.1.orig/src/Makefile.am gnac-0.2.4.1/src/Makefile.am ---- gnac-0.2.4.1.orig/src/Makefile.am 2012-03-01 00:35:14.000000000 +0100 -+++ gnac-0.2.4.1/src/Makefile.am 2015-01-09 23:49:31.339712589 +0100 -@@ -73,6 +73,7 @@ - $(AM_CFLAGS) \ - $(GSTREAMER_CFLAGS) \ - $(GTK_CFLAGS) \ -+ $(LIBXML_CFLAGS) \ - $(NOTIFY_CFLAGS) \ - $(UNIQUE_CFLAGS) \ - $(WARN_CFLAGS) \ -@@ -82,6 +83,7 @@ - $(top_builddir)/libgnac/libgnac.la \ - $(GSTREAMER_LIBS) \ - $(GTK_LIBS) \ -+ $(LIBXML_LIBS) \ - $(NOTIFY_LIBS) \ - $(UNIQUE_LIBS) - -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-aac.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-aac.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c 2015-01-10 01:03:33.835412850 +0100 -@@ -34,8 +34,6 @@ - AudioProfileGeneric *generic; - - gchar *bitrate; -- gchar *outputformat; -- gchar *profile; - gchar *tns; - } - AudioProfileAAC; -@@ -60,7 +58,6 @@ - gnac_profiles_aac_init(void) - { - GtkWidget *widget; -- GtkWidget *widget2; - - gnac_profiles_default_init(&aac_bfi); - -@@ -68,23 +65,12 @@ - gnac_profiles_utils_init_widget(&aac_bfi, "combo-bitrate", - "//variable[@id='bitrate']"); - -- // Profile -- widget = gnac_profiles_utils_init_widget(&aac_bfi, "combo-profile", -- "//variable[@id='profile']"); -- widget2 = gnac_profiles_utils_get_widget(&aac_bfi, "label-profile"), -- gnac_profiles_utils_add_description_tooltip(&aac_bfi, -- "//variable[@id='profile']/description", widget, widget2, NULL); -- - // Tns - widget = gnac_profiles_utils_init_widget(&aac_bfi, "checkbutton-tns", - "//variable[@id='tns']"); - gnac_profiles_utils_add_description_tooltip(&aac_bfi, - "//variable[@id='tns']/description", widget, NULL); - -- // Outputformat -- gnac_profiles_utils_init_widget(&aac_bfi, "combo-outputformat", -- "//variable[@id='outputformat']"); -- - gnac_profiles_xml_engine_free_doc_xpath(aac_bfi.doc); - aac_bfi.doc = NULL; - -@@ -97,11 +83,12 @@ - { - gchar *pipeline = gnac_profiles_default_generate_pipeline(&aac_bfi); - pipeline = gnac_profiles_utils_add_properties(pipeline, &aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - - gnac_profiles_properties_update_textbuffer(pipeline); - -+ pipeline = gnac_profiles_utils_add_pipe(pipeline, "audio/mpeg, mpegversion=4, stream-format=adts ! aacparse"); -+ - g_free(aac_bfi.pipeline); - - aac_bfi.pipeline = pipeline; -@@ -113,8 +100,7 @@ - { - gnac_profiles_default_reset_ui(&aac_bfi); - gnac_profiles_utils_reset_values(&aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - } - - -@@ -129,8 +115,6 @@ - AudioProfileAAC *profile = (AudioProfileAAC *) data; - gnac_profiles_utils_set_values(&aac_bfi, - "combo-bitrate", profile->bitrate, -- "combo-outputformat", profile->outputformat, -- "combo-profile", profile->profile, - "checkbutton-tns", profile->tns, - NULL); - } -@@ -153,8 +137,6 @@ - gnac_profiles_utils_free_audio_profile_generic(profile->generic); - - g_free(profile->bitrate); -- g_free(profile->outputformat); -- g_free(profile->profile); - g_free(profile->tns); - g_free(profile); - } -@@ -171,8 +153,6 @@ - - gnac_profiles_utils_get_values_and_set(&aac_bfi, - "combo-bitrate", &profile->bitrate, -- "combo-outputformat", &profile->outputformat, -- "combo-profile", &profile->profile, - "checkbutton-tns", &profile->tns, - NULL); - -@@ -196,8 +176,6 @@ - XMLDoc *doc = gnac_profiles_default_save_profile(profile->generic, &aac_bfi); - gnac_profiles_xml_engine_add_values(doc, - "bitrate", profile->bitrate, -- "outputformat", profile->outputformat, -- "profile", profile->profile, - "tns", profile->tns, - NULL); - gnac_profiles_xml_engine_save_doc(doc, profile->generic->name); -@@ -216,8 +194,6 @@ - gnac_profiles_utils_load_saved_profile(doc, - "/audio-profile/format-specific/", - "bitrate", &profile->bitrate, -- "outputformat", &profile->outputformat, -- "profile", &profile->profile, - "tns", &profile->tns, - NULL); - -@@ -230,8 +206,7 @@ - { - gnac_profiles_default_clean_up(&aac_bfi); - gnac_profiles_utils_free_values(&aac_bfi, -- "combo-bitrate", "combo-outputformat", -- "combo-profile", "checkbutton-tns", NULL); -+ "combo-bitrate", "checkbutton-tns", NULL); - gnac_profiles_utils_free_basic_format_info(&aac_bfi); - } - -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.c 2012-02-28 12:26:06.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.c 2015-01-09 23:49:31.339712589 +0100 -@@ -33,26 +33,17 @@ - { - AudioProfileGeneric *generic; - -- gchar *encoding_mode; -+ gchar *target; - gdouble quality; -- gdouble compression_ratio; - gchar *bitrate; -- gchar *preset; -- gdouble mean_abr; -- gdouble mean_bitrate; -- gchar *min_bitrate; -- gchar *max_bitrate; -- gchar *mode; -+ gchar *mono; - } - AudioProfileLame; - - typedef enum { -- CONSTANT_BITRATE, -- AVERAGE_BITRATE, -- VARIABLE_BITRATE, -- PRESETS, -- COMPRESSION_RATIO --} EncodingMode; -+ QUALITY, -+ BITRATE, -+} Target; - - BasicFormatInfo lame_bfi = { - PKGDATADIR "/profiles/gnac-profiles-lame.xml", -@@ -78,7 +69,7 @@ - - - void --gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget, -+gnac_profiles_lame_on_target_changed(GtkComboBox *widget, - gpointer user_data) - { - gnac_profiles_lame_vbr_on_changed(widget); -@@ -90,7 +81,6 @@ - gnac_profiles_lame_init(void) - { - GtkWidget *widget; -- GtkWidget *widget2; - - gnac_profiles_default_init(&lame_bfi); - -@@ -102,42 +92,13 @@ - gnac_profiles_utils_init_widget(&lame_bfi, "slider-vbr-quality", - "//variable[@id='quality']"); - -- // Compression ratio -- widget = gnac_profiles_utils_init_widget(&lame_bfi, -- "slider-compression-ratio", "//variable[@id='compression-ratio']"); -- widget2 = gnac_profiles_utils_get_widget(&lame_bfi, -- "label-compression-ratio"); -- gnac_profiles_utils_add_description_tooltip(&lame_bfi, -- "//variable[@id='compression-ratio']/description", -- widget, widget2, NULL); -- -- // Preset -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-preset", -- "//variable[@id='preset']"); -- -- // Abr bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "slider-mean-abr", -- "//variable[@id='mean-bitrate']"); -- - // Mode -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-mode", -- "//variable[@id='mode']"); -- -- // Mean bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "slider-mean-vbr", -- "//variable[@id='mean-bitrate']"); -+ gnac_profiles_utils_init_widget(&lame_bfi, "combo-mono", -+ "//variable[@id='mono']"); - -- // Min bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-min-vbr", -- "//variable[@id='min-bitrate']"); -- -- // Max bitrate -- gnac_profiles_utils_init_widget(&lame_bfi, "combo-max-vbr", -- "//variable[@id='max-bitrate']"); -- -- // Encoding mode -- widget = gnac_profiles_utils_init_widget(&lame_bfi, "combo-encoding-mode", -- "//variable[@id='encoding-mode']"); -+ // Target -+ widget = gnac_profiles_utils_init_widget(&lame_bfi, "combo-target", -+ "//variable[@id='target']"); - - gnac_profiles_lame_vbr_on_changed(GTK_COMBO_BOX(widget)); - -@@ -149,26 +110,6 @@ - - - static void --gnac_profiles_lame_show_abr_widgets(gboolean show) --{ -- GtkWidget *abr_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-mean-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-mean-abr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-min-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-min-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-max-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-max-vbr") -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(abr_widgets); i++) { -- if (show) gtk_widget_show_all(abr_widgets[i]); -- else gtk_widget_hide(abr_widgets[i]); -- } --} -- -- --static void - gnac_profiles_lame_show_cbr_widgets(gboolean show) - { - GtkWidget *cbr_widgets[] = { -@@ -190,12 +131,6 @@ - GtkWidget *vbr_widgets[] = { - gnac_profiles_utils_get_widget(&lame_bfi, "label-vbr"), - gnac_profiles_utils_get_widget(&lame_bfi, "hbox-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-mean-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-mean-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-min-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-min-vbr"), -- gnac_profiles_utils_get_widget(&lame_bfi, "checkbutton-max-bitrate"), -- gnac_profiles_utils_get_widget(&lame_bfi, "combo-max-vbr") - }; - - guint i; -@@ -207,48 +142,12 @@ - - - static void --gnac_profiles_lame_show_presets_widgets(gboolean show) --{ -- GtkWidget *presets_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-preset"), -- gnac_profiles_utils_get_widget(&lame_bfi, "hbox-preset"), -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(presets_widgets); i++) { -- if (show) gtk_widget_show_all(presets_widgets[i]); -- else gtk_widget_hide(presets_widgets[i]); -- } --} -- -- --static void --gnac_profiles_lame_show_compression_ratio_widgets(gboolean show) --{ -- GtkWidget *compression_ratio_widgets[] = { -- gnac_profiles_utils_get_widget(&lame_bfi, "label-compression-ratio"), -- gnac_profiles_utils_get_widget(&lame_bfi, "slider-compression-ratio"), -- }; -- -- guint i; -- for (i = 0; i < G_N_ELEMENTS(compression_ratio_widgets); i++) { -- if (show) gtk_widget_show_all(compression_ratio_widgets[i]); -- else gtk_widget_hide(compression_ratio_widgets[i]); -- } --} -- -- --static void - gnac_profiles_lame_vbr_on_changed(GtkComboBox *widget) - { -- EncodingMode encoding_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -+ Target target = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - -- gnac_profiles_lame_show_abr_widgets(encoding_mode == AVERAGE_BITRATE); -- gnac_profiles_lame_show_cbr_widgets(encoding_mode == CONSTANT_BITRATE); -- gnac_profiles_lame_show_vbr_widgets(encoding_mode == VARIABLE_BITRATE); -- gnac_profiles_lame_show_presets_widgets(encoding_mode == PRESETS); -- gnac_profiles_lame_show_compression_ratio_widgets( -- encoding_mode == COMPRESSION_RATIO); -+ gnac_profiles_lame_show_cbr_widgets(target == BITRATE); -+ gnac_profiles_lame_show_vbr_widgets(target == QUALITY); - } - - -@@ -257,54 +156,25 @@ - { - gchar *pipeline = gnac_profiles_default_generate_pipeline(&lame_bfi); - GtkWidget *widget = gnac_profiles_utils_get_widget(&lame_bfi, -- "combo-encoding-mode"); -- EncodingMode encoding_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); -+ "combo-target"); -+ Target target = gtk_combo_box_get_active(GTK_COMBO_BOX(widget)); - - // Mode - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-mode", NULL); -+ "combo-mono", NULL); - -- switch (encoding_mode) -+ switch (target) - { -- case CONSTANT_BITRATE: -+ case BITRATE: - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", "combo-bitrate", NULL); -+ "combo-target", "combo-bitrate", NULL); - break; - -- case AVERAGE_BITRATE: -+ case QUALITY: - pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", NULL); -- pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, -- "%.0f", "slider-mean-abr", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_combo(pipeline, -- &lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", -- "combo-max-vbr", "checkbutton-max-bitrate", -- NULL); -- break; -- -- case VARIABLE_BITRATE: -- pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-encoding-mode", NULL); -+ "combo-target", NULL); - pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, - "%.0f", "slider-vbr-quality", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_slider(pipeline, -- &lame_bfi, "slider-mean-vbr", "checkbutton-mean-bitrate", NULL); -- pipeline = gnac_profiles_utils_add_properties_checked_combo(pipeline, -- &lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", -- "combo-max-vbr", "checkbutton-max-bitrate", -- NULL); -- break; -- -- case PRESETS: -- pipeline = gnac_profiles_utils_add_properties(pipeline, &lame_bfi, -- "combo-preset", NULL); -- break; -- -- case COMPRESSION_RATIO: -- pipeline = gnac_profiles_utils_add_properties_slider(pipeline, &lame_bfi, -- "%.0f", "slider-compression-ratio", NULL); - break; - - default: -@@ -321,26 +191,12 @@ - } - - --void --gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget, -- GtkToggleButton *togglebutton) --{ -- gnac_profiles_utils_on_toggle_optionnal_property(togglebutton, widget); -- gnac_profiles_lame_generate_pipeline(); --} -- -- - static void - gnac_profiles_lame_reset_ui(void) - { - gnac_profiles_utils_reset_values(&lame_bfi, -- "combo-mode", "combo-bitrate", "combo-min-vbr", "combo-max-vbr", -- "combo-preset", "combo-encoding-mode", "slider-vbr-quality", -- "slider-compression-ratio", "slider-mean-vbr", "slider-mean-abr", -+ "combo-mono", "combo-bitrate", "combo-target", "slider-vbr-quality", - NULL); -- gnac_profiles_utils_set_active_toggle_button(&lame_bfi, FALSE, -- "checkbutton-mean-bitrate", "checkbutton-min-bitrate", -- "checkbutton-max-bitrate", NULL); - } - - -@@ -354,42 +210,18 @@ - - AudioProfileLame *profile = (AudioProfileLame *) data; - gnac_profiles_utils_set_values(&lame_bfi, -- "combo-encoding-mode", profile->encoding_mode, -- "combo-mode", profile->mode, NULL); -+ "combo-target", profile->target, -+ "combo-mono", profile->mono, NULL); - - if (profile->bitrate) - { - gnac_profiles_utils_set_values(&lame_bfi, - "combo-bitrate", profile->bitrate, NULL); - } -- else if (profile->preset) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "combo-preset", profile->preset, NULL); -- } -- else if (profile->mean_abr != -1) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "slider-mean-abr", profile->mean_abr, NULL); -- gnac_profiles_utils_set_values_checked(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", profile->max_bitrate, -- NULL); -- } - else if (profile->quality != -1) - { - gnac_profiles_utils_set_values(&lame_bfi, - "slider-vbr-quality", profile->quality, NULL); -- gnac_profiles_utils_set_values_checked(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", profile->max_bitrate, -- "slider-mean-vbr", "checkbutton-mean-bitrate", profile->mean_bitrate, -- NULL); -- } -- else if (profile->compression_ratio != -1) -- { -- gnac_profiles_utils_set_values(&lame_bfi, -- "slider-compression-ratio", profile->compression_ratio, NULL); - } - } - -@@ -406,16 +238,10 @@ - { - AudioProfileLame *profile = g_malloc(sizeof(AudioProfileLame)); - -- profile->encoding_mode = NULL; -- profile->mode = NULL; -+ profile->target = NULL; -+ profile->mono = NULL; - profile->bitrate = NULL; -- profile->preset = NULL; - profile->quality = -1; -- profile->compression_ratio = -1; -- profile->mean_bitrate = -1; -- profile->mean_abr = -1; -- profile->min_bitrate = NULL; -- profile->max_bitrate = NULL; - - return profile; - } -@@ -428,12 +254,9 @@ - - AudioProfileLame *profile = (AudioProfileLame *) data; - gnac_profiles_utils_free_audio_profile_generic(profile->generic); -- g_free(profile->encoding_mode); -- g_free(profile->mode); -+ g_free(profile->target); -+ g_free(profile->mono); - g_free(profile->bitrate); -- g_free(profile->min_bitrate); -- g_free(profile->max_bitrate); -- g_free(profile->preset); - g_free(profile); - } - -@@ -447,49 +270,23 @@ - profile->generic = generic; - - gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "combo-encoding-mode", &profile->encoding_mode, -- "combo-mode", &profile->mode, -+ "combo-target", &profile->target, -+ "combo-mono", &profile->mono, - NULL); - - GtkWidget *widget = gnac_profiles_utils_get_widget(&lame_bfi, -- "combo-encoding-mode"); -+ "combo-target"); - - switch (gtk_combo_box_get_active(GTK_COMBO_BOX(widget))) - { -- case CONSTANT_BITRATE: -+ case BITRATE: - gnac_profiles_utils_get_values_and_set(&lame_bfi, - "combo-bitrate", &profile->bitrate, NULL); - break; - -- case AVERAGE_BITRATE: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "slider-mean-abr", &profile->mean_abr, NULL); -- gnac_profiles_utils_get_values_checked_combo_and_set(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", &profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", &profile->max_bitrate, -- NULL ); -- break; -- -- case VARIABLE_BITRATE: -+ case QUALITY: - gnac_profiles_utils_get_values_and_set(&lame_bfi, - "slider-vbr-quality", &profile->quality, NULL); -- gnac_profiles_utils_get_values_checked_slider_and_set(&lame_bfi, -- "slider-mean-vbr", "checkbutton-mean-bitrate", &profile->mean_bitrate, -- NULL); -- gnac_profiles_utils_get_values_checked_combo_and_set(&lame_bfi, -- "combo-min-vbr", "checkbutton-min-bitrate", &profile->min_bitrate, -- "combo-max-vbr", "checkbutton-max-bitrate", &profile->max_bitrate, -- NULL ); -- break; -- -- case PRESETS: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "combo-preset", &profile->preset, NULL); -- break; -- -- case COMPRESSION_RATIO: -- gnac_profiles_utils_get_values_and_set(&lame_bfi, -- "slider-compression-ratio", &profile->compression_ratio, NULL); - break; - - default: -@@ -513,49 +310,25 @@ - if (!data) return; - - gchar *quality = NULL; -- gchar *mean_bitrate = NULL; -- gchar *mean_abr = NULL; -- gchar *compression_ratio = NULL; - AudioProfileLame *profile = (AudioProfileLame *) data; - - if (profile->quality != -1) - { - quality = gnac_profiles_utils_gdouble_to_gchararray(profile->quality); -- -- if (profile->mean_bitrate != -1) { -- mean_bitrate = gnac_profiles_utils_gdouble_to_gchararray( -- profile->mean_bitrate); -- } -- } -- else if (profile->mean_abr != -1) -- { -- mean_abr = gnac_profiles_utils_gdouble_to_gchararray(profile->mean_abr); -- } -- else if (profile->compression_ratio != -1) { -- compression_ratio = gnac_profiles_utils_gdouble_to_gchararray( -- profile->compression_ratio); - } - - XMLDoc *doc = gnac_profiles_default_save_profile(profile->generic, &lame_bfi); - gnac_profiles_xml_engine_add_values(doc, -- "encoding-mode", profile->encoding_mode, -+ "target", profile->target, - "bitrate", profile->bitrate, - "quality", quality, -- "compression-ratio", compression_ratio, -- "preset", profile->preset, -- "mean-abr", mean_abr, -- "mean-bitrate", mean_bitrate, -- "min-bitrate", profile->min_bitrate, -- "max-bitrate", profile->max_bitrate, -- "mode", profile->mode, -+ "mono", profile->mono, - NULL); - - gnac_profiles_xml_engine_save_doc(doc, profile->generic->name); - - gnac_profiles_xml_engine_free_doc_xpath(doc); - g_free(quality); -- g_free(mean_bitrate); -- g_free(compression_ratio); - } - - -@@ -564,42 +337,20 @@ - AudioProfileGeneric *generic) - { - gchar *quality; -- gchar *mean_bitrate; -- gchar *mean_abr; -- gchar *compression_ratio; - - AudioProfileLame *profile = gnac_profiles_lame_audio_profile_new(); - profile->generic = generic; - gnac_profiles_utils_load_saved_profile(doc, - "/audio-profile/format-specific/", -- "encoding-mode", &profile->encoding_mode, -+ "target", &profile->target, - "bitrate", &profile->bitrate, - "quality", &quality, -- "compression-ratio", &compression_ratio, -- "preset", &profile->preset, -- "mean-abr", &mean_abr, -- "mean-bitrate", &mean_bitrate, -- "min-bitrate", &profile->min_bitrate, -- "max-bitrate", &profile->max_bitrate, -- "mode", &profile->mode, -+ "mono", &profile->mono, - NULL); - - if (quality) { - profile->quality = gnac_profiles_utils_gchararray_to_gdouble(quality); - g_free(quality); -- -- if (mean_bitrate) { -- profile->mean_bitrate = gnac_profiles_utils_gchararray_to_gdouble( -- mean_bitrate); -- g_free(mean_bitrate); -- } -- } else if (mean_abr) { -- profile->mean_abr = gnac_profiles_utils_gchararray_to_gdouble(mean_abr); -- g_free(mean_abr); -- } else if (compression_ratio) { -- profile->compression_ratio = gnac_profiles_utils_gchararray_to_gdouble( -- compression_ratio); -- g_free(compression_ratio); - } - - return profile; -@@ -611,9 +362,7 @@ - { - gnac_profiles_default_clean_up(&lame_bfi); - gnac_profiles_utils_free_values(&lame_bfi, -- "combo-mode", "combo-bitrate", "combo-min-vbr", "combo-max-vbr", -- "combo-preset", "combo-encoding-mode", "slider-vbr-quality", -- "slider-compression-ratio", "slider-mean-vbr", "slider-mean-abr", -+ "combo-mono", "combo-bitrate", "combo-target", "slider-vbr-quality", - NULL); - gnac_profiles_utils_free_basic_format_info(&lame_bfi); - } -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.h gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.h ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-lame.h 2012-01-26 01:28:46.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-lame.h 2015-01-09 23:49:31.343045941 +0100 -@@ -37,8 +37,8 @@ - gnac_profiles_lame_generate_pipeline(void); - - void --gnac_profiles_lame_on_encoding_mode_changed(GtkComboBox *widget, -- gpointer user_data); -+gnac_profiles_lame_on_target_changed(GtkComboBox *widget, -+ gpointer user_data); - - void - gnac_profiles_lame_advanced_bitrate_on_toggle(GtkWidget *widget, -diff -Naur gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-unknown.c gnac-0.2.4.1/src/profiles/formats/gnac-profiles-unknown.c ---- gnac-0.2.4.1.orig/src/profiles/formats/gnac-profiles-unknown.c 2012-02-27 11:27:10.000000000 +0100 -+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-unknown.c 2015-01-09 23:49:31.343045941 +0100 -@@ -49,7 +49,7 @@ - }; - - const gchar *base_pipeline = -- "audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert !"; -+ "audioconvert ! audio/x-raw, rate=44100, channels=2 ! audioconvert !"; - - static GtkTextView *pipeline_text_view; - static GtkWidget *pipeline_box; -diff -Naur gnac-0.2.4.1.orig/src/profiles/gnac-profiles-default.c gnac-0.2.4.1/src/profiles/gnac-profiles-default.c ---- gnac-0.2.4.1.orig/src/profiles/gnac-profiles-default.c 2012-04-22 14:09:01.000000000 +0200 -+++ gnac-0.2.4.1/src/profiles/gnac-profiles-default.c 2015-01-09 23:49:31.343045941 +0100 -@@ -23,6 +23,7 @@ - * Boston, MA 02110-1301 USA - */ - -+#include - #include - - #include "gnac-main.h" diff --git a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch b/srcpkgs/gnac/patches/no-gnome-doc-utils.patch deleted file mode 100644 index 00f89a338dbc..000000000000 --- a/srcpkgs/gnac/patches/no-gnome-doc-utils.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -55,7 +55,7 @@ AM_GLIB_GNU_GETTEXT - dnl Check for GSettings macros - GLIB_GSETTINGS - --GNOME_DOC_INIT([0.17.2]) -+GNOME_DOC_INIT([0.17.2],[:],[:]) - GNOME_DEBUG_CHECK - GNOME_COMPILE_WARNINGS([maximum]) - GNOME_CXX_WARNINGS([yes]) ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,5 @@ - SUBDIRS = \ - data \ -- help \ - libgnac \ - man \ - po \ diff --git a/srcpkgs/gnac/patches/no-po-check.patch b/srcpkgs/gnac/patches/no-po-check.patch deleted file mode 100644 index bf1ddb4a9e7d..000000000000 --- a/srcpkgs/gnac/patches/no-po-check.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- a/po/POTFILES.skip -+++ b/po/POTFILES.skip -@@ -1,3 +1,4 @@ - # List of source files that should NOT be translated. - # Please keep this file sorted alphabetically. - data/gnac.desktop.in -+intl/plural.c diff --git a/srcpkgs/gnac/template b/srcpkgs/gnac/template deleted file mode 100644 index 9fea6a370e87..000000000000 --- a/srcpkgs/gnac/template +++ /dev/null @@ -1,26 +0,0 @@ -# Template file for 'gnac' -pkgname=gnac -version=0.2.4.1 -revision=4 -build_style=gnu-configure -configure_args="--disable-scrollkeeper --disable-schemas-compile" -hostmakedepends="gnome-common gettext-devel pkg-config intltool libtool - glib-devel gtk+3-devel gst-plugins-base1-devel - autoconf-archive which" -makedepends="libxml2-devel gtk+3-devel gst-plugins-base1-devel libunique-devel - libnotify-devel gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 - desktop-file-utils hicolor-icon-theme" -depends="gst-plugins-good1 gst-plugins-bad1 gst-plugins-ugly1 - desktop-file-utils hicolor-icon-theme" -short_desc="Audio conversion program for the Gnome desktop" -maintainer="Orphaned " -license="GPL-3.0-or-later" -homepage="http://gnac.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.bz2" -checksum=8f9c4731bbc40fde57c311a2a7fabe4e3200198abfe7415c659b98a2d54869da -CFLAGS="-fPIC -fcommon" - -pre_configure() { - autoreconf -fi - intltoolize --force -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 67261247a6a4..6863341e9a7d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -97,6 +97,7 @@ replaces=" giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 + gnac<=0.2.4.1_4 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 gnome-games<=40.0_1 From dc00f831d2cb5312b8a21a2eddaa94e64c214ecf Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:32:20 -0700 Subject: [PATCH 03/10] ario: remove unused dependency on libunique1 --- srcpkgs/ario/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ario/template b/srcpkgs/ario/template index c9fc6f3cd9b7..ce6c01e518ce 100644 --- a/srcpkgs/ario/template +++ b/srcpkgs/ario/template @@ -6,15 +6,16 @@ build_style=gnu-configure configure_args="--disable-static" hostmakedepends="pkg-config intltool" makedepends="avahi-glib-libs-devel dbus-glib-devel gnutls-devel gtk+3-devel - libcurl-devel libmpdclient-devel libnotify-devel libunique1-devel taglib-devel" + libcurl-devel libmpdclient-devel libnotify-devel taglib-devel" short_desc="GTK client for MPD" maintainer="Leah Neukirchen " -license="GPL-2" +license="GPL-2.0-or-later" homepage="http://ario-player.sourceforge.net/?en" distfiles="${SOURCEFORGE_SITE}/${pkgname}-player/${pkgname}-${version}.tar.gz" checksum=1442ede8eef994384489d72d028d7f7b1a1c81efe737f7147587dd02c772d09a +make_check=no # Tests still depend on build files that have been removed by upstream -post_extract() { +post_patch() { vsed -i 's,,,g' src/ario-profiles.c vsed -i -e 's/DATADIRNAME=lib/DATADIRNAME=share/' configure } From b29fa4f4c46cb0858b360edfbf7d12fd2d464113 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:26:08 -0700 Subject: [PATCH 04/10] lxsession: remove unused dependency on libunique1 --- srcpkgs/lxsession/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lxsession/template b/srcpkgs/lxsession/template index 8fe456a1d43e..9cb6e2cf8507 100644 --- a/srcpkgs/lxsession/template +++ b/srcpkgs/lxsession/template @@ -5,7 +5,7 @@ revision=1 build_style=gnu-configure configure_args="--enable-buildin-clipboard --enable-buildin-polkit --enable-gtk3" hostmakedepends="pkg-config intltool vala-devel autoconf automake glib-devel gettext-devel" -makedepends="dbus-glib-devel gtk+3-devel polkit-devel libunique1-devel" +makedepends="dbus-glib-devel gtk+3-devel polkit-devel" depends="hicolor-icon-theme" short_desc="LXDE X11 Session Manager" maintainer="Orphaned " From 27c2044c19c57aa1343528afdf0a63ebb17bb380 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:23:55 -0700 Subject: [PATCH 05/10] fcitx-configtool: remove unused dependency on libunique1 --- srcpkgs/fcitx-configtool/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/fcitx-configtool/template b/srcpkgs/fcitx-configtool/template index b1ed12bbf046..b72c70a18a22 100644 --- a/srcpkgs/fcitx-configtool/template +++ b/srcpkgs/fcitx-configtool/template @@ -4,7 +4,7 @@ version=0.4.10 revision=2 build_style=cmake hostmakedepends="pkg-config libfcitx glib-devel" -makedepends="iso-codes fcitx-devel gtk+3-devel libunique1-devel dbus-glib-devel" +makedepends="iso-codes fcitx-devel gtk+3-devel dbus-glib-devel" depends="iso-codes" short_desc="GTK-based configuration tool for fcitx" maintainer="Robert La Spina " From 648a87355184264ef5b0d1a89f34f0087f8a2e86 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:09:10 -0700 Subject: [PATCH 06/10] gmpc: remove package Unmaintained, hasn't seen a release since 2011 and the homepage is a parked domain. Still depends on gtk2 and libunique1. --- srcpkgs/gmpc-devel | 1 - srcpkgs/gmpc/patches/locale-dir.patch | 20 ----------------- srcpkgs/gmpc/patches/no-mallard-check.patch | 22 ------------------ srcpkgs/gmpc/template | 25 --------------------- srcpkgs/removed-packages/template | 2 ++ 5 files changed, 2 insertions(+), 68 deletions(-) delete mode 120000 srcpkgs/gmpc-devel delete mode 100644 srcpkgs/gmpc/patches/locale-dir.patch delete mode 100644 srcpkgs/gmpc/patches/no-mallard-check.patch delete mode 100644 srcpkgs/gmpc/template diff --git a/srcpkgs/gmpc-devel b/srcpkgs/gmpc-devel deleted file mode 120000 index 6a1f09135ead..000000000000 --- a/srcpkgs/gmpc-devel +++ /dev/null @@ -1 +0,0 @@ -gmpc \ No newline at end of file diff --git a/srcpkgs/gmpc/patches/locale-dir.patch b/srcpkgs/gmpc/patches/locale-dir.patch deleted file mode 100644 index 8398823dd765..000000000000 --- a/srcpkgs/gmpc/patches/locale-dir.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure -+++ b/configure -@@ -11347,7 +11347,7 @@ fi - - ;; - *) -- DATADIRNAME=lib -+ DATADIRNAME=share - ;; - esac - fi -@@ -15026,7 +15026,7 @@ fi - ;; - *) - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - ;; - esac - fi diff --git a/srcpkgs/gmpc/patches/no-mallard-check.patch b/srcpkgs/gmpc/patches/no-mallard-check.patch deleted file mode 100644 index f36891f28498..000000000000 --- a/srcpkgs/gmpc/patches/no-mallard-check.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,7 +1,7 @@ - man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1 - EXTRA_DIST = $(man_MANS) - --SUBDIRS=Mallard -+SUBDIRS= - - .PHONY: doc - doc: Manual.txt ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -311,7 +311,7 @@ unique_CFLAGS = @unique_CFLAGS@ - unique_LIBS = @unique_LIBS@ - man_MANS = gmpc.1 gmpc-remote.1 gmpc-remote-stream.1 - EXTRA_DIST = $(man_MANS) --SUBDIRS = Mallard -+SUBDIRS = - all: all-recursive - - .SUFFIXES: diff --git a/srcpkgs/gmpc/template b/srcpkgs/gmpc/template deleted file mode 100644 index ec0c03ade913..000000000000 --- a/srcpkgs/gmpc/template +++ /dev/null @@ -1,25 +0,0 @@ -# Template file for 'gmpc' -pkgname=gmpc -version=11.8.16 -revision=3 -build_style=gnu-configure -hostmakedepends="pkg-config gob2 intltool vala" -makedepends="gtk+-devel libSM-devel libmpd-devel libunique1-devel libsoup-devel sqlite-devel" -depends="xdg-utils hicolor-icon-theme" -short_desc="Gnome Music Player Client - The true MPD client" -maintainer="Dave Davenport " -license="GPL-2.0-or-later" -homepage="http://gmpclient.org/" -distfiles="http://download.sarine.nl/Programs/gmpc/${version%.*}/gmpc-${version}.tar.gz" -checksum=a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c - -LDFLAGS="-lm" - -gmpc-devel_package() { - short_desc+=" - development files" - depends="gtk+-devel libmpd-devel" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 6863341e9a7d..390efa35aa1d 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -97,6 +97,8 @@ replaces=" giti<=1.0.0_1 gksu<=2.0.2_4 glibmm-doc<=2.64.2_2 + gmpc-devel<=11.8.16_3 + gmpc<=11.8.16_3 gnac<=0.2.4.1_4 gnome-doc-utils<=0.20.10_9 gnome-documents<=3.34.0_2 From c469b68ae969aa52d86f07787fa5092b4c96c8d0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:13:39 -0700 Subject: [PATCH 07/10] libmpd: remove package Unmaintained, hasn't seen a release since 2011 and the homepage is a parked domain. Still depends on libunique1. --- common/shlibs | 1 - srcpkgs/libmpd-devel | 1 - srcpkgs/libmpd/patches/fix-build.patch | 13 ------------- srcpkgs/libmpd/template | 24 ------------------------ srcpkgs/removed-packages/template | 2 ++ 5 files changed, 2 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libmpd-devel delete mode 100644 srcpkgs/libmpd/patches/fix-build.patch delete mode 100644 srcpkgs/libmpd/template diff --git a/common/shlibs b/common/shlibs index f829ee12e80f..18e4fc1d7ac7 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2532,7 +2532,6 @@ libKF5Solid.so.5 libksolid-5.15.0_2 libfreeimage.so.3 freeimage-3.17.0_1 libfreeimageplus.so.3 freeimage-plus-3.17.0_1 libtoluapp.so toluapp-1.0.93_1 -libmpd.so.1 libmpd-11.8.17_1 libfa.so.1 augeas-1.4.0_1 libaugeas.so.0 augeas-1.4.0_1 libplot.so.2 plotutils-2.6_1 diff --git a/srcpkgs/libmpd-devel b/srcpkgs/libmpd-devel deleted file mode 120000 index 385a94df2454..000000000000 --- a/srcpkgs/libmpd-devel +++ /dev/null @@ -1 +0,0 @@ -libmpd \ No newline at end of file diff --git a/srcpkgs/libmpd/patches/fix-build.patch b/srcpkgs/libmpd/patches/fix-build.patch deleted file mode 100644 index 5f4d86644538..000000000000 --- a/srcpkgs/libmpd/patches/fix-build.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/libmpd-internal.h 2015-11-05 15:05:11.982772276 +0100 -+++ b/src/libmpd-internal.h 2015-11-05 15:05:32.845719672 +0100 -@@ -20,6 +20,10 @@ - #ifndef __MPD_INTERNAL_LIB_ - #define __MPD_INTERNAL_LIB_ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ - #include "libmpdclient.h" - struct _MpdData_real; - diff --git a/srcpkgs/libmpd/template b/srcpkgs/libmpd/template deleted file mode 100644 index 608057b0232a..000000000000 --- a/srcpkgs/libmpd/template +++ /dev/null @@ -1,24 +0,0 @@ -# Template file for 'libmpd' -pkgname=libmpd -version=11.8.17 -revision=3 -build_style=gnu-configure -hostmakedepends="pkg-config" -makedepends="libglib-devel" -short_desc="Signal based wrapper around libmpdclient" -maintainer="Dave Davenport " -license="GPL-2.0-or-later" -homepage="http://gmpc.wikia.com/wiki/Gnome_Music_Player_Client" -distfiles="http://download.sarine.nl/Programs/gmpc/${version%.*}/${pkgname}-${version}.tar.gz" -checksum=fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 - -libmpd-devel_package() { - short_desc+=" - development files" - depends="${makedepends} ${sourcepkg}>=${version}_${revision}" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/*.a - vmove usr/lib/*.so - } -} diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 390efa35aa1d..13fdcef2a4b8 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -238,6 +238,8 @@ replaces=" libmagick6-devel<=6.9.12.12_2 libmagick6-perl<=6.9.12.12_2 libmagick6<=6.9.12.12_2 + libmpd-devel<=11.8.17_3 + libmpd<=11.8.17_3 libpyside-python3<=5.15.0_2 libqmatrixclient-devel<=0.5.3.2_1 libqmatrixclient<=0.5.3.2_1 From 5524c05221cd022be7d94540331b67463c6736c0 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 17:13:20 -0700 Subject: [PATCH 08/10] atril: remove unused dependency on libunique --- srcpkgs/atril/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/atril/template b/srcpkgs/atril/template index e3beb69b9e04..150d7d520e49 100644 --- a/srcpkgs/atril/template +++ b/srcpkgs/atril/template @@ -10,7 +10,7 @@ configure_args="--disable-schemas-compile --enable-djvu --enable-synctex=no hostmakedepends="glib-devel intltool itstool pkg-config perl-XML-Parser yelp-tools mate-common $(vopt_if gir 'gobject-introspection')" makedepends="djvulibre-devel libSM-devel libcaja-devel libgxps-devel - libnotify-devel libsecret-devel libspectre-devel libunique-devel + libnotify-devel libsecret-devel libspectre-devel mate-desktop-devel mate-icon-theme poppler-glib-devel webkit2gtk-devel" depends="dbus mate-desktop mate-icon-theme" short_desc="Simply a document viewer for MATE" From eb474e4a47434cb86ff655a455ad641170d8cdc3 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:03:48 -0700 Subject: [PATCH 09/10] libunique1: remove package --- srcpkgs/libunique1-devel | 1 - .../patches/gcc7-fix-char_ptr.patch | 11 - .../patches/glib-max-allowed-2_56.patch | 12 - srcpkgs/libunique1/patches/unique-gdbus.patch | 529 ------------------ srcpkgs/libunique1/template | 43 -- srcpkgs/libunique1/update | 2 - srcpkgs/removed-packages/template | 2 + 7 files changed, 2 insertions(+), 598 deletions(-) delete mode 120000 srcpkgs/libunique1-devel delete mode 100644 srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch delete mode 100644 srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch delete mode 100644 srcpkgs/libunique1/patches/unique-gdbus.patch delete mode 100644 srcpkgs/libunique1/template delete mode 100644 srcpkgs/libunique1/update diff --git a/srcpkgs/libunique1-devel b/srcpkgs/libunique1-devel deleted file mode 120000 index 708be9fc956a..000000000000 --- a/srcpkgs/libunique1-devel +++ /dev/null @@ -1 +0,0 @@ -libunique1 \ No newline at end of file diff --git a/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch b/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch deleted file mode 100644 index 5c19f80e6a30..000000000000 --- a/srcpkgs/libunique1/patches/gcc7-fix-char_ptr.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- libunique-1.1.6/unique/uniqueapp.c 2009-11-01 19:33:13.000000000 +0100 -+++ libunique-1.1.6/unique/uniqueapp.c 2017-06-15 17:30:10.775354836 +0200 -@@ -176,7 +176,7 @@ - { - gchar *id; - -- if (startup_id && startup_id != '\0') -+ if (startup_id && *startup_id != '\0') - id = g_strdup (startup_id); - else - { diff --git a/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch b/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch deleted file mode 100644 index e0da846253d4..000000000000 --- a/srcpkgs/libunique1/patches/glib-max-allowed-2_56.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- libunique-1.16/unique/uniqueapp.c 2020-01-19 15:48:40.380617759 +0100 -+++ libunique-1.16/unique/uniqueapp.c 2020-01-19 16:02:19.196585111 +0100 -@@ -55,6 +55,9 @@ - #include - #include - -+/* Avoid error for macros deprecated in glib-2.58 */ -+#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_56 -+#define GLIB_VERSION_MAX_ALLOWED GLIB_VERSION_2_56 - #include - #include - diff --git a/srcpkgs/libunique1/patches/unique-gdbus.patch b/srcpkgs/libunique1/patches/unique-gdbus.patch deleted file mode 100644 index 880c0c0ff99a..000000000000 --- a/srcpkgs/libunique1/patches/unique-gdbus.patch +++ /dev/null @@ -1,529 +0,0 @@ -From 01066039529c0181f231325476bb4823c16a2aea Mon Sep 17 00:00:00 2001 -From: Christian Persch -Date: Sat, 15 May 2010 17:47:45 +0000 -Subject: Add GDBus backend - -Add backend using GDBus, the new D-BUS binding in GIO 2.25. - -Bug #618723. ---- -diff --git a/configure.ac b/configure.ac -index bc3163a..b6a4221 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -116,6 +116,19 @@ AS_IF([test "x$have_dbus" = "xyes"], - - AM_CONDITIONAL([HAVE_DBUS], [test "x$have_dbus" = "xyes"]) - -+dnl GDBus backend -+dnl This is the default backend if GIO is recent enough -+m4_define([gdbus_gio_required],[2.25.7]) -+PKG_CHECK_MODULES([GDBUS],[gio-2.0 >= gdbus_gio_required],[have_gdbus=yes],[have_gdbus=no]) -+ -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ AC_DEFINE([HAVE_GDBUS],[1],[Define if GDBus backend is enabled]) -+ ] -+ ) -+ -+AM_CONDITIONAL([HAVE_GDBUS],[test "$have_gdbus" = "yes"]) -+ - dnl Bacon backend - dnl This is the fallback backend, so we *need* these headers and functions - dnl even if we end up using D-Bus -@@ -146,7 +159,13 @@ AM_CONDITIONAL([HAVE_BACON], [test "x$have_bacon" = "xyes"]) - - dnl Choose the default backend - AC_MSG_CHECKING([for default IPC mechanism]) --AS_IF([test "x$have_dbus" = "xyes"], -+AS_IF([test "x$have_gdbus" = "xyes"], -+ [ -+ UNIQUE_DEFAULT_BACKEND=gdbus -+ AC_MSG_RESULT([GDBus]) -+ ], -+ -+ [test "x$have_dbus" = "xyes"], - [ - UNIQUE_DEFAULT_BACKEND=dbus - AC_MSG_RESULT([D-Bus]) -@@ -243,6 +262,7 @@ AC_CONFIG_FILES([ - unique/uniqueversion.h - unique/bacon/Makefile - unique/dbus/Makefile -+ unique/gdbus/Makefile - tests/Makefile - po/Makefile.in - ]) -@@ -261,6 +281,7 @@ Configuration: - Backends: - Unix Domain Socket: $have_bacon - D-BUS: $have_dbus -+ GDBus: $have_gdbus - - Default backend: $UNIQUE_DEFAULT_BACKEND - " -diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am -index 3172588..2c1dbf4 100644 ---- a/doc/reference/Makefile.am -+++ b/doc/reference/Makefile.am -@@ -50,7 +50,8 @@ IGNORE_HFILES = \ - uniquemarshal.h \ - stamp-uniquemarshal.h \ - bacon \ -- dbus -+ dbus \ -+ gdbus - - EXTRA_HFILES = - -diff --git a/unique/Makefile.am b/unique/Makefile.am -index 6475a87..8f0b7ba 100644 ---- a/unique/Makefile.am -+++ b/unique/Makefile.am -@@ -12,7 +12,11 @@ if HAVE_DBUS - SUBDIRS += dbus - endif - --DIST_SUBDIRS = bacon dbus -+if HAVE_GDBUS -+SUBDIRS += gdbus -+endif -+ -+DIST_SUBDIRS = bacon dbus gdbus - - INCLUDES = -I$(top_srcdir) - -@@ -72,6 +76,10 @@ if HAVE_DBUS - unique_backend_libs += $(top_builddir)/unique/dbus/libunique-dbus.la - endif - -+if HAVE_GDBUS -+unique_backend_libs += $(top_builddir)/unique/gdbus/libunique-gdbus.la -+endif -+ - uniquedir = $(includedir)/unique-1.0/unique - unique_HEADERS = \ - $(unique_sources_h) \ -diff --git a/unique/gdbus/.gitignore b/unique/gdbus/.gitignore -new file mode 100644 -index 0000000..c7e22c3 ---- /dev/null -+++ b/unique/gdbus/.gitignore -@@ -0,0 +1,2 @@ -+libunique_gdbus_la-uniquebackend-gdbus.lo -+libunique-gdbus.la -diff --git a/unique/gdbus/Makefile.am b/unique/gdbus/Makefile.am -new file mode 100644 -index 0000000..e10637d ---- /dev/null -+++ b/unique/gdbus/Makefile.am -@@ -0,0 +1,24 @@ -+include $(top_srcdir)/build/autotools/Makefile.am.silent -+ -+noinst_LTLIBRARIES = libunique-gdbus.la -+ -+libunique_gdbus_la_SOURCES = \ -+ uniquebackend-gdbus.h \ -+ uniquebackend-gdbus.c -+ -+libunique_gdbus_la_PPCFLAGS = \ -+ -DG_LOG_DOMAIN=\"Unique-GDBus\" \ -+ -DG_DISABLE_SINGLE_INCLUDES \ -+ -I$(top_srcdir) \ -+ $(AM_CPPFLAGS) -+ -+libunique_gdbus_la_CFLAGS = \ -+ $(UNIQUE_CFLAGS) \ -+ $(UNIQUE_DEBUG_CFLAGS) \ -+ $(MAINTAINER_CFLAGS) \ -+ $(GDBUS_CFLAGS) \ -+ $(AM_CFLAGS) -+ -+libunique_gdbus_la_LIBADD = \ -+ $(UNIQUE_LIBS) \ -+ $(GDBUS_LIBS) -diff --git a/unique/gdbus/uniquebackend-gdbus.c b/unique/gdbus/uniquebackend-gdbus.c -new file mode 100644 -index 0000000..14d54a9 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.c -@@ -0,0 +1,303 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi -+ * Copyright © 2010 Christian Persch -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include -+#include -+ -+#include "../uniqueinternals.h" -+#include "uniquebackend-gdbus.h" -+ -+struct _UniqueBackendGDBus -+{ -+ UniqueBackend parent_instance; -+ -+ GDBusConnection *connection; -+ guint registration_id; -+ guint owner_id; -+ gboolean owns_name; -+ GMainLoop *loop; -+}; -+ -+struct _UniqueBackendGDBusClass -+{ -+ UniqueBackendClass parent_class; -+ GDBusNodeInfo *introspection_data; -+}; -+ -+G_DEFINE_TYPE (UniqueBackendGDBus, unique_backend_gdbus, UNIQUE_TYPE_BACKEND); -+ -+static const char introspection_xml[] = -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ "" -+ ""; -+ -+static void -+method_call_cb (GDBusConnection *connection, -+ const gchar *sender, -+ const gchar *object_path, -+ const gchar *interface_name, -+ const gchar *method_name, -+ GVariant *parameters, -+ GDBusMethodInvocation *invocation, -+ gpointer user_data) -+{ -+ if (g_strcmp0 (interface_name, "org.gtk.UniqueApp") != 0 || -+ g_strcmp0 (object_path, "/Factory") != 0) -+ return; -+ -+ if (g_strcmp0 (method_name, "SendMessage") == 0) -+ { -+ UniqueBackend *backend = UNIQUE_BACKEND (user_data); -+ const gchar *command_str, *data, *startup_id; -+ guint len, screen_num, workspace, time_; -+ UniqueMessageData message_data; -+ gint command; -+ UniqueResponse response; -+ GdkDisplay *display; -+ -+ g_variant_get (parameters, -+ "(&s(&suuu&s)u)", -+ &command_str, -+ &data, &len, &screen_num, &workspace, &startup_id, -+ &time_); -+ -+ command = unique_command_from_string (backend->parent, command_str); -+ if (command == 0) -+ { -+ g_dbus_method_invocation_return_error (invocation, -+ G_DBUS_ERROR, -+ G_DBUS_ERROR_INVALID_ARGS, -+ "Invalid command `%s' received", -+ command_str); -+ return; -+ } -+ -+ display = gdk_display_get_default (); -+ -+ message_data.data = len > 0 ? (guchar *) data : NULL; -+ message_data.length = (gint) len; -+ message_data.workspace = workspace; -+ message_data.startup_id = (char *) startup_id; -+ if (screen_num >= 0 && screen_num < gdk_display_get_n_screens (display)) -+ message_data.screen = gdk_display_get_screen (display, screen_num); -+ else -+ message_data.screen = gdk_screen_get_default (); -+ -+ response = unique_app_emit_message_received (backend->parent, command, &message_data, time_); -+ -+ g_dbus_method_invocation_return_value (invocation, -+ g_variant_new ("(s)", unique_response_to_string (response))); -+ return; -+ } -+} -+ -+static void -+name_acquired_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = TRUE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static void -+name_lost_cb (GDBusConnection *connection, -+ const gchar *name, -+ gpointer user_data) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (user_data); -+ -+ backend_gdbus->owns_name = FALSE; -+ if (backend_gdbus->loop && g_main_loop_is_running (backend_gdbus->loop)) -+ g_main_loop_quit (backend_gdbus->loop); -+} -+ -+static const GDBusInterfaceVTable interface_vtable = { -+ method_call_cb, -+ NULL, -+ NULL -+}; -+ -+static gboolean -+unique_backend_gdbus_request_name (UniqueBackend *backend) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ UniqueBackendGDBusClass *klass = UNIQUE_BACKEND_GDBUS_GET_CLASS (backend); -+ GError *error; -+ -+ error = NULL; -+ backend_gdbus->connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); -+ if (!backend_gdbus->connection) -+ { -+ g_warning ("Unable to open a connection to the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->registration_id = -+ g_dbus_connection_register_object (backend_gdbus->connection, -+ "/Factory", -+ klass->introspection_data->interfaces[0], -+ &interface_vtable, -+ backend, NULL, -+ &error); -+ if (backend_gdbus->registration_id == 0) -+ { -+ g_warning ("Unable to register object with the session bus: %s", -+ error->message); -+ g_error_free (error); -+ -+ return FALSE; -+ } -+ -+ backend_gdbus->owns_name = FALSE; -+ -+ backend_gdbus->owner_id = -+ g_bus_own_name_on_connection (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ G_BUS_NAME_OWNER_FLAGS_NONE, -+ name_acquired_cb, -+ name_lost_cb, -+ backend, NULL); -+ -+ backend_gdbus->loop = g_main_loop_new (NULL, FALSE); -+ g_main_loop_run (backend_gdbus->loop); -+ g_main_loop_unref (backend_gdbus->loop); -+ backend_gdbus->loop = NULL; -+ -+ return backend_gdbus->owns_name; -+} -+ -+static UniqueResponse -+unique_backend_gdbus_send_message (UniqueBackend *backend, -+ gint command, -+ UniqueMessageData *message_data, -+ guint time_) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (backend); -+ GVariantBuilder builder; -+ GVariant *result; -+ const gchar *command_str, *resp; -+ UniqueResponse response; -+ GError *error; -+ -+ command_str = unique_command_to_string (backend->parent, command); -+ -+ g_variant_builder_init (&builder, G_VARIANT_TYPE ("(s(suuus)u)")); -+ g_variant_builder_add (&builder, "s", command_str ? command_str : ""); -+ g_variant_builder_open (&builder, G_VARIANT_TYPE ("(suuus)")); -+ g_variant_builder_add (&builder, "s", message_data->data ? (char *) message_data->data : ""); -+ g_variant_builder_add (&builder, "u", (guint) message_data->length); -+ g_variant_builder_add (&builder, "u", (guint) gdk_screen_get_number (message_data->screen)); -+ g_variant_builder_add (&builder, "u", (guint) message_data->workspace); -+ g_variant_builder_add (&builder, "s", message_data->startup_id ? message_data->startup_id : ""); -+ g_variant_builder_close (&builder); -+ g_variant_builder_add (&builder, "u", time_); -+ -+ error = NULL; -+ result = g_dbus_connection_call_sync (backend_gdbus->connection, -+ unique_backend_get_name (backend), -+ "/Factory", -+ "org.gtk.UniqueApp", -+ "SendMessage", -+ g_variant_builder_end (&builder), -+ G_VARIANT_TYPE ("(s)"), -+ G_DBUS_CALL_FLAGS_NO_AUTO_START, -+ -1, -+ NULL, -+ &error); -+ if (error) -+ { -+ g_warning ("Error while sending message: %s", error->message); -+ g_error_free (error); -+ -+ return UNIQUE_RESPONSE_INVALID; -+ } -+ -+ g_variant_get (result, "(&s)", &resp); -+ response = unique_response_from_string (resp); -+ g_variant_unref (result); -+ -+ return response; -+} -+ -+static void -+unique_backend_gdbus_dispose (GObject *gobject) -+{ -+ UniqueBackendGDBus *backend_gdbus = UNIQUE_BACKEND_GDBUS (gobject); -+ -+ if (backend_gdbus->owner_id != 0) -+ { -+ g_bus_unown_name (backend_gdbus->owner_id); -+ backend_gdbus->owner_id = 0; -+ } -+ if (backend_gdbus->registration_id != 0) -+ { -+ g_assert (backend_gdbus->connection != NULL); -+ g_dbus_connection_unregister_object (backend_gdbus->connection, -+ backend_gdbus->registration_id); -+ backend_gdbus->registration_id = 0; -+ } -+ if (backend_gdbus->connection) -+ { -+ g_object_unref (backend_gdbus->connection); -+ backend_gdbus->connection = NULL; -+ } -+ -+ G_OBJECT_CLASS (unique_backend_gdbus_parent_class)->dispose (gobject); -+} -+ -+static void -+unique_backend_gdbus_class_init (UniqueBackendGDBusClass *klass) -+{ -+ GObjectClass *gobject_class = G_OBJECT_CLASS (klass); -+ UniqueBackendClass *backend_class = UNIQUE_BACKEND_CLASS (klass); -+ -+ gobject_class->dispose = unique_backend_gdbus_dispose; -+ -+ backend_class->request_name = unique_backend_gdbus_request_name; -+ backend_class->send_message = unique_backend_gdbus_send_message; -+ -+ klass->introspection_data = g_dbus_node_info_new_for_xml (introspection_xml, NULL); -+ g_assert (klass->introspection_data != NULL); -+} -+ -+static void -+unique_backend_gdbus_init (UniqueBackendGDBus *backend) -+{ -+} -diff --git a/unique/gdbus/uniquebackend-gdbus.h b/unique/gdbus/uniquebackend-gdbus.h -new file mode 100644 -index 0000000..41eb6e5 ---- /dev/null -+++ b/unique/gdbus/uniquebackend-gdbus.h -@@ -0,0 +1,43 @@ -+/* Unique - Single Instance application library -+ * uniquebackend-gdbus.c: GDBus implementation of UniqueBackend -+ * -+ * Copyright (C) 2007 Emmanuele Bassi -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library 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 -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+ * 02110-1301 USA -+ */ -+ -+#ifndef __UNIQUE_BACKEND_GDBUS_H__ -+#define __UNIQUE_BACKEND_GDBUS_H__ -+ -+#include -+ -+G_BEGIN_DECLS -+ -+#define UNIQUE_TYPE_BACKEND_GDBUS (unique_backend_gdbus_get_type ()) -+#define UNIQUE_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBus)) -+#define UNIQUE_IS_BACKEND_GDBUS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+#define UNIQUE_IS_BACKEND_GDBUS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), UNIQUE_TYPE_BACKEND_GDBUS)) -+#define UNIQUE_BACKEND_GDBUS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), UNIQUE_TYPE_BACKEND_GDBUS, UniqueBackendGDBusClass)) -+ -+typedef struct _UniqueBackendGDBus UniqueBackendGDBus; -+typedef struct _UniqueBackendGDBusClass UniqueBackendGDBusClass; -+ -+GType unique_backend_gdbus_get_type (void) G_GNUC_CONST; -+ -+G_END_DECLS -+ -+#endif /* __UNIQUE_BACKEND_GDBUS_H__ */ -diff --git a/unique/uniquebackend.c b/unique/uniquebackend.c -index 18a0c45..a76e42e 100644 ---- a/unique/uniquebackend.c -+++ b/unique/uniquebackend.c -@@ -298,6 +298,9 @@ unique_backend_send_message (UniqueBackend *backend, - #ifdef HAVE_DBUS - #include "dbus/uniquebackend-dbus.h" - #endif -+#ifdef HAVE_GDBUS -+#include "gdbus/uniquebackend-gdbus.h" -+#endif - - /** - * unique_backend_create: -@@ -329,6 +332,10 @@ unique_backend_create (void) - if (strcmp (backend_name, "dbus") == 0) - backend_gtype = unique_backend_dbus_get_type (); - #endif /* HAVE_DBUS */ -+#ifdef HAVE_GDBUS -+ if (strcmp (backend_name, "gdbus") == 0) -+ backend_gtype = unique_backend_gdbus_get_type (); -+#endif /* HAVE_GDBUS */ - #if !defined(HAVE_BACON) && !defined(HAVE_DBUS) - #error Need either bacon or dbus - #endif --- -cgit v0.8.3.1 diff --git a/srcpkgs/libunique1/template b/srcpkgs/libunique1/template deleted file mode 100644 index f73931b0c72b..000000000000 --- a/srcpkgs/libunique1/template +++ /dev/null @@ -1,43 +0,0 @@ -# Template file for 'libunique1' -pkgname=libunique1 -version=1.1.6 -revision=12 -wrksrc="libunique-${version}" -build_style=gnu-configure -build_helper="gir" -configure_args="--disable-static --disable-dbus" -hostmakedepends="libtool automake pkg-config glib-devel" -makedepends="libSM-devel gtk+-devel" -short_desc="Library for writing single instance applications (GTK+2)" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://wiki.gnome.org/Attic/LibUnique" -distfiles="${GNOME_SITE}/libunique/1.1/libunique-${version}.tar.bz2" -checksum=e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb - -CFLAGS="-Wno-deprecated-declarations" - -# Package build options -build_options="gir" -build_options_default="gir" - -pre_configure() { - # Fix build with glib 2.30. - for f in $(find ${wrksrc} -name *.[ch]); do - sed -i -s "s|G_CONST_RETURN|const|g" "$f" - done - sed -e "s,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g" \ - -e "s,AM_PROG_CC_STDC,AC_PROG_CC,g" -i configure.ac - autoreconf -fi -} - -libunique1-devel_package() { - depends="gtk+-devel ${sourcepkg}>=${version}_${revision}" - short_desc+=" - development files" - pkg_install() { - vmove usr/include - vmove usr/lib/pkgconfig - vmove "usr/lib/*.so" - vmove usr/share - } -} diff --git a/srcpkgs/libunique1/update b/srcpkgs/libunique1/update deleted file mode 100644 index 7f9701970515..000000000000 --- a/srcpkgs/libunique1/update +++ /dev/null @@ -1,2 +0,0 @@ -pkgname=libunique -ignore="[!1].*" diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 13fdcef2a4b8..2d7d9e018258 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -248,6 +248,8 @@ replaces=" librpcsecgss<=0.19_6 libshiboken-python3<=5.15.0_3 libspa-ffmpeg<=0.3.32_1 + libunique1-devel<=1.1.6_12 + libunique1<=1.1.6_12 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 libxslt-python<=1.1.34_5 From c7221dc6fc0f3af7cc31f72bcbe18d217d2d4733 Mon Sep 17 00:00:00 2001 From: oreo639 <31916379+Oreo639@users.noreply.github.com> Date: Tue, 23 Aug 2022 16:04:12 -0700 Subject: [PATCH 10/10] libunique: remove package --- srcpkgs/libunique-devel | 1 - srcpkgs/removed-packages/template | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 120000 srcpkgs/libunique-devel diff --git a/srcpkgs/libunique-devel b/srcpkgs/libunique-devel deleted file mode 120000 index a4f4bebbc83a..000000000000 --- a/srcpkgs/libunique-devel +++ /dev/null @@ -1 +0,0 @@ -libunique \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 2d7d9e018258..4daacf9f6a5a 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -250,6 +250,8 @@ replaces=" libspa-ffmpeg<=0.3.32_1 libunique1-devel<=1.1.6_12 libunique1<=1.1.6_12 + libunique-devel<=3.0.2_11 + libunique<=3.0.2_11 libxml2-python<=2.9.10_4 libxnoise<=0.2.21_4 libxslt-python<=1.1.34_5