* [gentoo-commits] repo/gentoo:master commit in: app-cdr/brasero/files/, app-cdr/brasero/
@ 2017-12-20 20:23 Mart Raudsepp
0 siblings, 0 replies; 2+ messages in thread
From: Mart Raudsepp @ 2017-12-20 20:23 UTC (permalink / raw
To: gentoo-commits
commit: 7491dceb622ea22ff7ce0a15c47859a77c165e6c
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 20 19:37:31 2017 +0000
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Wed Dec 20 20:21:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7491dceb
app-cdr/brasero: remove old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-cdr/brasero/Manifest | 1 -
app-cdr/brasero/brasero-3.12.1-r1.ebuild | 85 ----------------------
app-cdr/brasero/brasero-3.12.1.ebuild | 79 --------------------
.../brasero/files/brasero-3.12.1-libdvdcss.patch | 18 -----
4 files changed, 183 deletions(-)
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index e0c98e96f10..6919842a6d8 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,2 +1 @@
-DIST brasero-3.12.1.tar.xz 3683836 BLAKE2B 46364e387e08c7095a4ef3cf49a705ecff3d209bd44f031c1d841947177197ba65122ad67b12888b778d0cbfae7c107ad5138ecb1bb37ef5ead1953298e93d31 SHA512 c9a78b9bc627f4420f5cf70825aa8de6e42497e63e293a0382916c9cd1a2bb3ae0beb2b95b624b7203ab17dfd8c8bb10c18c16848079b82077663abe34674eda
DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
diff --git a/app-cdr/brasero/brasero-3.12.1-r1.ebuild b/app-cdr/brasero/brasero-3.12.1-r1.ebuild
deleted file mode 100644
index a920d74d105..00000000000
--- a/app-cdr/brasero/brasero-3.12.1-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils 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 packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_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-0.6.3:= )
- 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-0.12:0= )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- x11-themes/hicolor-icon-theme
- css? ( media-libs/libdvdcss:1.2 )
- !libburn? (
- app-cdr/cdrdao
- app-cdr/dvd+rw-tools
- virtual/cdrtools )
- mp3? (
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-mad:1.0 )
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- dev-util/itstool
- >=dev-util/gtk-doc-am-1.12
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-# app-text/yelp-tools
-# gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_prepare() {
- # https://bugzilla.gnome.org/show_bug.cgi?id=744916
- epatch "${FILESDIR}"/${PN}-3.12.1-libdvdcss.patch
- gnome2_src_prepare
-}
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
- 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.1.ebuild b/app-cdr/brasero/brasero-3.12.1.ebuild
deleted file mode 100644
index 15d68d9e493..00000000000
--- a/app-cdr/brasero/brasero-3.12.1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GCONF_DEBUG="no"
-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 packagekit playlist test tracker"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-COMMON_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-0.6.3 )
- 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-0.12:0= )
-"
-RDEPEND="${COMMON_DEPEND}
- media-libs/gst-plugins-good:1.0
- media-plugins/gst-plugins-meta:1.0
- x11-themes/hicolor-icon-theme
- css? ( media-libs/libdvdcss:1.2 )
- !libburn? (
- app-cdr/cdrdao
- app-cdr/dvd+rw-tools
- virtual/cdrtools )
- mp3? (
- media-libs/gst-plugins-ugly:1.0
- media-plugins/gst-plugins-mad:1.0 )
- packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${COMMON_DEPEND}
- >=dev-util/intltool-0.50
- >=dev-util/gtk-doc-am-1.12
- sys-devel/gettext
- virtual/pkgconfig
- test? ( app-text/docbook-xml-dtd:4.3 )
-"
-# eautoreconf deps
-# app-text/yelp-tools
-# gnome-base/gnome-common
-
-PDEPEND="gnome-base/gvfs"
-
-src_configure() {
- DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
- 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) \
- ITSTOOL=$(type -P true)
-}
diff --git a/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch b/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch
deleted file mode 100644
index 86b009d71f7..00000000000
--- a/app-cdr/brasero/files/brasero-3.12.1-libdvdcss.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-The current version of libdvdcss has removed the dvdcss_interface_2 symbol so
-brasero incorrectly assumes it's the wrong version.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1193628
-
-diff -Naur brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c
---- brasero-3.12.1.orig/plugins/dvdcss/burn-dvdcss.c 2015-11-12 09:48:53.782886516 -0600
-+++ brasero-3.12.1/plugins/dvdcss/burn-dvdcss.c 2015-11-12 09:53:03.152656908 -0600
-@@ -95,9 +95,6 @@
- if (!module)
- goto error_doesnt_exist;
-
-- if (!g_module_symbol (module, "dvdcss_interface_2", &address))
-- goto error_version;
--
- if (!g_module_symbol (module, "dvdcss_open", &address))
- goto error_version;
- dvdcss_open = address;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-cdr/brasero/files/, app-cdr/brasero/
@ 2024-07-07 8:56 Miroslav Šulc
0 siblings, 0 replies; 2+ messages in thread
From: Miroslav Šulc @ 2024-07-07 8:56 UTC (permalink / raw
To: gentoo-commits
commit: 42f46ee5b25ca13a3fb9f9780fc07414df2ce624
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 7 08:56:16 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Jul 7 08:56:30 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42f46ee5
app-cdr/brasero: fixed incompatible pointers with a better patch
Bug: https://bugs.gentoo.org/process_bug.cgi
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...sero-3.12.3.ebuild => brasero-3.12.3-r1.ebuild} | 0
.../brasero-3.12.3-incompatible-pointers.patch | 56 +++++++++++++++++++---
2 files changed, 49 insertions(+), 7 deletions(-)
diff --git a/app-cdr/brasero/brasero-3.12.3.ebuild b/app-cdr/brasero/brasero-3.12.3-r1.ebuild
similarity index 100%
rename from app-cdr/brasero/brasero-3.12.3.ebuild
rename to app-cdr/brasero/brasero-3.12.3-r1.ebuild
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
index edfdb8786cd9..e8c6dd58a480 100644
--- a/app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch
+++ b/app-cdr/brasero/files/brasero-3.12.3-incompatible-pointers.patch
@@ -1,14 +1,42 @@
+From 5cdefa8c76ddb797bce8b67a3f5767678bd36a5a Mon Sep 17 00:00:00 2001
+From: sid <sidtosh4@gmail.com>
+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
-@@ -844,7 +844,7 @@ brasero_drive_properties_set_property (GObject *object,
- /* NOTE: no need to unref a potential previous session since
- * it's only set at construct time */
- session = g_value_get_object (value);
+@@ -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 = (BraseroSessionCfg *)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 (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)
@@ -16,7 +44,21 @@
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,
++ 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
+
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-07-07 8:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-20 20:23 [gentoo-commits] repo/gentoo:master commit in: app-cdr/brasero/files/, app-cdr/brasero/ Mart Raudsepp
-- strict thread matches above, loose matches on Subject: below --
2024-07-07 8:56 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox