rpms/brasero
7
0
Fork 0
Code Issues Pull Requests Releases Activity

fix build against recent gtk

Browse Source
This commit is contained in:
Matthias Clasen 2010-09-22 10:24:33 -04:00
parent d965dd029f
commit 617bc9ce87
2 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
brasero.spec
View File

@ -14,6 +14,8 @@ URL: http://www.gnome.org/projects/brasero/
#VCS: git:git://git.gnome.org/brasero #VCS: git:git://git.gnome.org/brasero
Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/2.31/%{name}-%{version}.tar.bz2 Source0: http://ftp.gnome.org/pub/GNOME/sources/brasero/2.31/%{name}-%{version}.tar.bz2
Patch0: gtk-build.patch
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
BuildRequires: glib2-devel >= 2.15.6 BuildRequires: glib2-devel >= 2.15.6
BuildRequires: GConf2-devel BuildRequires: GConf2-devel
@ -96,6 +98,7 @@ developing brasero applications.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .gtk-build
%build %build
%configure \ %configure \
@ -107,8 +110,7 @@ developing brasero applications.
--enable-preview \ --enable-preview \
--enable-inotify \ --enable-inotify \
--disable-caches \ --disable-caches \
--disable-static \ --disable-static
--disable-schemas-install
sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool
make %{?_smp_mflags} make %{?_smp_mflags}

70
gtk-build.patch Normal file
View File

@ -0,0 +1,70 @@
--- brasero-2.31.92/libbrasero-utils/brasero-jacket-buffer.c 2010-09-13 18:27:15.000000000 -0400
+++ hacked/libbrasero-utils/brasero-jacket-buffer.c 2010-09-22 09:31:27.139998002 -0400
@@ -76,16 +76,12 @@
guint left_margin_accumulative = 0;
guint right_margin_accumulative = 0;
- g_return_if_fail (!dest->realized);
-
for (; tags; tags = tags->next) {
GtkTextTag *tag;
gboolean accumulative_margin;
gboolean background_set;
gboolean fg_color_set;
gboolean pg_bg_color_set;
- gboolean bg_stipple_set;
- gboolean fg_stipple_set;
gboolean scale_set;
gboolean left_margin_set;
gboolean justification_set;
@@ -113,8 +109,6 @@
"background-set", &background_set,
"foreground-set", &fg_color_set,
"paragraph-background-set", &pg_bg_color_set,
- "background-stipple-set", &bg_stipple_set,
- "foreground-stipple-set", &fg_stipple_set,
"scale-set", &scale_set,
"left-margin-set", &left_margin_set,
"justification-set", &justification_set,
@@ -161,20 +155,6 @@
g_object_get (tag, "paragraph-background-gdk", &dest->pg_bg_color, NULL);
}
- if (bg_stipple_set) {
- if (dest->appearance.bg_stipple)
- g_object_unref (dest->appearance.bg_stipple);
- g_object_get (tag, "background-stipple", &dest->appearance.bg_stipple, NULL);
-
- dest->appearance.draw_bg = TRUE;
- }
-
- if (fg_stipple_set) {
- if (dest->appearance.fg_stipple)
- g_object_unref (dest->appearance.fg_stipple);
- g_object_get (tag, "foreground-stipple", &dest->appearance.fg_stipple, NULL);
- }
-
if (font_desc) {
if (dest->font) {
pango_font_description_merge (dest->font, font_desc, TRUE);
@@ -187,7 +167,7 @@
/* multiply all the scales together to get a composite */
if (scale_set) {
gdouble font_scale;
- g_object_get (tag, "foreground-stipple", &font_scale, NULL);
+ g_object_get (tag, "font-scale", &font_scale, NULL);
dest->font_scale *= font_scale;
}
--- brasero-2.31.92/libbrasero-utils/brasero-jacket-edit.c 2010-09-13 18:27:15.000000000 -0400
+++ hacked/libbrasero-utils/brasero-jacket-edit.c 2010-09-22 09:33:13.807998006 -0400
@@ -837,8 +837,7 @@
window = gtk_dialog_new_with_buttons (_("Cover Editor"),
GTK_WINDOW (toplevel),
GTK_DIALOG_MODAL|
- GTK_DIALOG_DESTROY_WITH_PARENT|
- GTK_DIALOG_NO_SEPARATOR,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
NULL);