pool/gtk3
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 94622 from home:dimstar:branches:GNOME:Factory

Browse Source 
Fix random parallel build failures

OBS-URL: https://build.opensuse.org/request/show/94622
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=69
This commit is contained in:
Dominique Leuenberger 2011-11-30 20:34:43 +00:00 committed by Git OBS Bridge
parent 0a4a37f3cd
commit dea0c0dbfa
3 changed files with 38 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gtk3-parallel-build.patch Normal file
View File

@ -0,0 +1,28 @@
From 7756f499950cd77d6b8db70a8d49309c459c7cd2 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Mon, 28 Nov 2011 08:12:28 +0000
Subject: Fix up makefile rules for parallel builds
The gtkwin32css.h generation code used a temporary filename that was also
used by some other files, which is racy. Use a unique one.
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 083252f..f082677 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -913,9 +913,9 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
gtkwin32css.h: stamp-gtkwin32css.h
@true
stamp-gtkwin32css.h: @REBUILD@ gtk-win32.css
- $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print " \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gmlh\
- && (cmp -s xgen-gmlh gtkwin32css.h || cp xgen-gmlh gtkwin32css.h) \
- && rm -f xgen-gmlh \
+ $(AWK) 'BEGIN { print "static const char *gtk_win32_default_css = " } { print " \"" $$0 "\\n\""} END { print ";" }' < $(srcdir)/gtk-win32.css >> xgen-gw3c\
+ && (cmp -s xgen-gw3c gtkwin32css.h || cp xgen-gw3c gtkwin32css.h) \
+ && rm -f xgen-gw3c \
&& echo timestamp > $(@F)
gtktypebuiltins.h: stamp-gtktypebuiltins.h
--
cgit v0.9.0.2

7
gtk3.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 30 20:08:11 UTC 2011 - dimstar@opensuse.org
- Add gtk3-parallel-build.patch: Fix up makefile rules for parallel
builds. Avoids random build failures. Taken from git, commit
id=7756f49.
-------------------------------------------------------------------
Tue Nov 22 08:38:28 UTC 2011 - dimstar@opensuse.org

3
gtk3.spec
View File

@ -41,6 +41,8 @@ Patch0: gtk3-GTK_PATH64.patch
Patch1: gtk3-path-local.patch
# PATCH-FIX-UPSTREAM gtk3-bnc130159-bgo319483-async-font-selection.patch bnc130159 bgo319483 federico@novell.com - Load fonts asynchronously in GtkFontSelection to make it appear faster for CJK languages
Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch
# PATCH-FIX-UPSTREAM gtk3-parallel-build.patch dimstar@opensuse.org -- Fix up makefile rules for parallel build. Taken from upstream git.
Patch4: gtk3-parallel-build.patch
BuildRequires: fdupes
BuildRequires: cups-devel
BuildRequires: pkgconfig(atk) >= 2.1.5
@ -284,6 +286,7 @@ cp -a %{S:1} .
%endif
%patch1 -p0
%patch3 -p1
%patch4 -p1
%build
%configure \