From 5d8ffbc273ca664e15618d557ced3e02de1a884b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Jul 2024 12:24:47 +0100 Subject: gentoo auto-resync : 07:07:2024 - 12:24:46 --- app-cdr/brasero/Manifest | 3 +- app-cdr/brasero/brasero-3.12.3-r1.ebuild | 77 ++++++++++++++++++++++ app-cdr/brasero/brasero-3.12.3.ebuild | 73 -------------------- .../brasero-3.12.3-incompatible-pointers.patch | 64 ++++++++++++++++++ 4 files changed, 143 insertions(+), 74 deletions(-) create mode 100644 app-cdr/brasero/brasero-3.12.3-r1.ebuild delete mode 100644 app-cdr/brasero/brasero-3.12.3.ebuild create mode 100644 app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch (limited to 'app-cdr/brasero') diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest index d00c785723e1..b213c781e2ad 100644 --- a/app-cdr/brasero/Manifest +++ b/app-cdr/brasero/Manifest @@ -1,3 +1,4 @@ +AUX brasero-3.12.3-incompatible-pointers.patch 2723 BLAKE2B d59e7c81ba67783ceb9ac0ff8c7c46475c45a6b82239a59c927e74e6d321611a603eb5f4d73d2b9a31055f24ec57a5722c03e0f526f5be14a52897b8fc21a179 SHA512 331c51d8b7649a7ce9ad12609f9fa34234b09e49f772e6ffb48c08fa02078d0ed566bb661a02450bef0c6302999ad2de61613ece879dc0008baf54d50017216d DIST brasero-3.12.3.tar.xz 3156012 BLAKE2B e657f29719164b786e29a4974102cf6b0eb3316bec84a08838bd62b952c43994e0187f6cfeaa5080fa794b1ff1684553a3d643cd309b2957a8d4191c7ea8cfbf SHA512 0e3c97b2a754f7178207db390e33b832fcaed3856ae5dee447e5c26d712728302dbebbf839a4fb7565f63b3ebb1e4936e20739482a8114e6fe2700805659270a -EBUILD brasero-3.12.3.ebuild 1799 BLAKE2B f02d050386f6bfbb70b260564d0736108a650b0b62db3b90dd16b8c80f4fe449104eb35bb00e39059eec90255e3ce052014b5cc5fc32ab0680f3d21110990164 SHA512 c40a075d54a05d00642b0a8f93768dcf1ed1af5bce7e12d3ff9a7230dafc38997baee40d3293c9fd92d4650156c9524d70431084eeabf18568716bc67bf9cc7a +EBUILD brasero-3.12.3-r1.ebuild 1860 BLAKE2B 2db6b01bf13c81f6fbd0848a8cfcd9a685ed296f8020829cc8269677deeebf292b44625f0d2a565f020bc9b9f0776d31b2242855306f7a39dc5c7f0652b50517 SHA512 3862a78e29d63a0c951198dccd2cfc3e51b8c3825112582135d962e9af7d963e5bde401dc83d800f833e03dcfb327551481bdb97542703a19849dca90f7918b4 MISC metadata.xml 737 BLAKE2B 6660d69e0f3e33cd34c7ca424ad04e94e8b806c00d786d7d8aff8c543bc2ba3b89423175635957d83b8ec8eea948f5f6811b2103ba8301a489d3af99bc847125 SHA512 02493f9f119572a902e2e54976799881d570a78e942c86429d0c49a06b5efe7b314ce403773a08ece15c56b14d5cc8ed5b700e030835d4cdcd7d16f87bce805b diff --git a/app-cdr/brasero/brasero-3.12.3-r1.ebuild b/app-cdr/brasero/brasero-3.12.3-r1.ebuild new file mode 100644 index 000000000000..402c35fd9bdd --- /dev/null +++ b/app-cdr/brasero/brasero-3.12.3-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="CD/DVD burning application for the GNOME desktop" +HOMEPAGE="https://wiki.gnome.org/Apps/Brasero" + +LICENSE="GPL-2+ CC-BY-SA-3.0" +SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3 +KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" +IUSE="+css +introspection +libburn mp3 nautilus playlist tracker" + +DEPEND=" + >=dev-libs/glib-2.29.14:2 + >=x11-libs/gtk+-3:3[introspection?] + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=dev-libs/libxml2-2.6:2 + >=x11-libs/libnotify-0.6.1:= + + media-libs/libcanberra[gtk3] + x11-libs/libICE + x11-libs/libSM + + introspection? ( >=dev-libs/gobject-introspection-1.30:= ) + libburn? ( + >=dev-libs/libburn-0.4:= + >=dev-libs/libisofs-0.6.4:= ) + nautilus? ( >=gnome-base/nautilus-2.91.90 ) + playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) + tracker? ( app-misc/tracker:3= ) +" +RDEPEND="${DEPEND} + media-libs/gst-plugins-good:1.0 + media-plugins/gst-plugins-meta:1.0[mp3?] + x11-themes/hicolor-icon-theme + css? ( media-libs/libdvdcss:1.2 ) + !libburn? ( + app-cdr/cdrdao + app-cdr/cdrtools + app-cdr/dvd+rw-tools + ) +" +BDEPEND=" + >=dev-util/intltool-0.50 + dev-util/itstool + >=dev-build/gtk-doc-am-1.12 + sys-devel/gettext + virtual/pkgconfig +" +# eautoreconf deps +# app-text/yelp-tools +# gnome-base/gnome-common + +PDEPEND="gnome-base/gvfs" + +PATCHES=( + "${FILESDIR}/${P}-incompatible-pointers.patch" +) + +src_configure() { + gnome2_src_configure \ + --disable-caches \ + $(use_enable !libburn cdrtools) \ + $(use_enable !libburn cdrkit) \ + $(use_enable !libburn cdrdao) \ + $(use_enable !libburn growisofs) \ + $(use_enable introspection) \ + $(use_enable libburn libburnia) \ + $(use_enable nautilus) \ + $(use_enable playlist) \ + $(use_enable tracker search) +} diff --git a/app-cdr/brasero/brasero-3.12.3.ebuild b/app-cdr/brasero/brasero-3.12.3.ebuild deleted file mode 100644 index ad5a76453344..000000000000 --- a/app-cdr/brasero/brasero-3.12.3.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -GNOME2_LA_PUNT="yes" - -inherit gnome2 - -DESCRIPTION="CD/DVD burning application for the GNOME desktop" -HOMEPAGE="https://wiki.gnome.org/Apps/Brasero" - -LICENSE="GPL-2+ CC-BY-SA-3.0" -SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3 -IUSE="+css +introspection +libburn mp3 nautilus playlist tracker" -KEYWORDS="amd64 ~arm arm64 ~loong ppc ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.29.14:2 - >=x11-libs/gtk+-3:3[introspection?] - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=dev-libs/libxml2-2.6:2 - >=x11-libs/libnotify-0.6.1:= - - media-libs/libcanberra[gtk3] - x11-libs/libICE - x11-libs/libSM - - introspection? ( >=dev-libs/gobject-introspection-1.30:= ) - libburn? ( - >=dev-libs/libburn-0.4:= - >=dev-libs/libisofs-0.6.4:= ) - nautilus? ( >=gnome-base/nautilus-2.91.90 ) - playlist? ( >=dev-libs/totem-pl-parser-2.29.1:= ) - tracker? ( app-misc/tracker:3= ) -" -RDEPEND="${DEPEND} - media-libs/gst-plugins-good:1.0 - media-plugins/gst-plugins-meta:1.0[mp3?] - x11-themes/hicolor-icon-theme - css? ( media-libs/libdvdcss:1.2 ) - !libburn? ( - app-cdr/cdrdao - app-cdr/cdrtools - app-cdr/dvd+rw-tools - ) -" -BDEPEND=" - >=dev-util/intltool-0.50 - dev-util/itstool - >=dev-build/gtk-doc-am-1.12 - sys-devel/gettext - virtual/pkgconfig -" -# eautoreconf deps -# app-text/yelp-tools -# gnome-base/gnome-common - -PDEPEND="gnome-base/gvfs" - -src_configure() { - gnome2_src_configure \ - --disable-caches \ - $(use_enable !libburn cdrtools) \ - $(use_enable !libburn cdrkit) \ - $(use_enable !libburn cdrdao) \ - $(use_enable !libburn growisofs) \ - $(use_enable introspection) \ - $(use_enable libburn libburnia) \ - $(use_enable nautilus) \ - $(use_enable playlist) \ - $(use_enable tracker search) -} diff --git a/app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch b/app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch new file mode 100644 index 000000000000..e8c6dd58a480 --- /dev/null +++ b/app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch @@ -0,0 +1,64 @@ +From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001 +From: sid +Date: Mon, 3 Jun 2024 18:51:08 +0100 +Subject: [PATCH] Fix gcc 14.x build failure (due to + -Wincompatible-pointer-types) + +The changes for 'brasero-drive-properties.c' are kept inline with +'brasero-burn-options.c' (public API) for the sake of consistency. + +Fixes: https://gitlab.gnome.org/GNOME/brasero/-/issues/370 +--- a/libbrasero-burn/brasero-drive-properties.c ++++ b/libbrasero-burn/brasero-drive-properties.c +@@ -835,23 +835,19 @@ brasero_drive_properties_set_property (GObject *object, + GParamSpec *pspec) + { + BraseroDrivePropertiesPrivate *priv; +- BraseroBurnSession *session; + + priv = BRASERO_DRIVE_PROPERTIES_PRIVATE (object); + + switch (property_id) { + case PROP_SESSION: /* Readable and only writable at creation time */ +- /* NOTE: no need to unref a potential previous session since +- * it's only set at construct time */ +- session = g_value_get_object (value); +- priv->session = g_object_ref (session); ++ priv->session = g_object_ref (g_value_get_object (value)); + + brasero_drive_properties_update (BRASERO_DRIVE_PROPERTIES (object)); +- priv->valid_sig = g_signal_connect (session, ++ priv->valid_sig = g_signal_connect (priv->session, + "is-valid", + G_CALLBACK (brasero_drive_properties_is_valid_cb), + object); +- priv->output_sig = g_signal_connect (session, ++ priv->output_sig = g_signal_connect (priv->session, + "output-changed", + G_CALLBACK (brasero_drive_properties_output_changed_cb), + object); +--- a/libbrasero-utils/brasero-metadata.c ++++ b/libbrasero-utils/brasero-metadata.c +@@ -665,7 +665,7 @@ brasero_metadata_install_missing_plugins (BraseroMetadata *self) + + context = gst_install_plugins_context_new (); + gst_install_plugins_context_set_xid (context, brasero_metadata_get_xid (self)); +- status = gst_install_plugins_async ((gchar **) details->pdata, ++ status = gst_install_plugins_async ((const gchar* const*) details->pdata, + context, + brasero_metadata_install_plugins_result, + downloads); +--- a/libbrasero-utils/brasero-pk.c ++++ b/libbrasero-utils/brasero-pk.c +@@ -230,7 +230,7 @@ brasero_pk_install_gstreamer_plugin (BraseroPK *package, + + context = gst_install_plugins_context_new (); + gst_install_plugins_context_set_xid (context, xid); +- status = gst_install_plugins_async ((gchar **) gst_plugins->pdata, ++ status = gst_install_plugins_async ((const gchar* const*) gst_plugins->pdata, + context, + brasero_pk_install_gst_plugin_result, + package); +-- +GitLab + -- cgit v1.2.3