From: 宋文武 <iyzsong@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 1/7] gnu: gobject-introspection: Update to 1.44.0.
Date: Mon, 20 Apr 2015 18:11:55 +0800 [thread overview]
Message-ID: <1429524721-21449-1-git-send-email-iyzsong@gmail.com> (raw)
* gnu/packages/glib.scm (gobject-introspection): Update to 1.44.0.
[source]: Use mirror://gnome.
[arguments]<#:phases>: Remove.
* gnu/packages/patches/gobject-introspection-cc.patch: Rewrite to
set os.environ['CC'] in 'giscanner/__init__.py'.
---
gnu/packages/glib.scm | 15 ++++---------
.../patches/gobject-introspection-cc.patch | 25 ++++++++++------------
2 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 688c0b6..fe89909 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -207,14 +207,14 @@ dynamic loading, and an object system.")
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.42.0")
+ (version "1.44.0")
(source (origin
(method url-fetch)
- (uri (string-append "http://ftp.gnome.org/pub/GNOME/sources/"
+ (uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "1xwm7wmr9r9wp6xljb3bckx3a4siybavaq39w46ly7gpskxfv8iv"))
+ (base32 "1b972qg2yb51sdavfvb6kc19akwc15c1bwnbg81vadxamql2q33g"))
(patches (list
(search-patch "gobject-introspection-cc.patch")
(search-patch
@@ -243,14 +243,7 @@ dynamic loading, and an object system.")
(arguments
`(;; The patch 'gobject-introspection-absolute-shlib-path.patch' causes
;; some tests to fail.
- #:tests? #f
- #:phases
- (alist-cons-before
- 'configure 'patch-paths
- (lambda _
- (substitute* "giscanner/sourcescanner.py"
- (("GUIX_GCC_PATH") (which "gcc"))))
- %standard-phases)))
+ #:tests? #f))
(home-page "https://wiki.gnome.org/GObjectIntrospection")
(synopsis "Generate interface introspection data for GObject libraries")
(description
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
index 38b919a..d9cacf4 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -1,14 +1,11 @@
---- a/giscanner/sourcescanner.py 2013-12-15 23:03:54.002937000 +0100
-+++ b/giscanner/sourcescanner.py 2013-12-15 23:04:50.322937000 +0100
-@@ -277,6 +277,11 @@
- defines = ['__GI_SCANNER__']
- undefs = []
- cpp_args = os.environ.get('CC', 'cc').split() # support CC="ccache gcc"
-+ if (cpp_args == ['cc'] and
-+ not any(map(lambda x: os.access(os.path.join(x, 'cc'), os.X_OK),
-+ os.environ.get('PATH').split(':')))):
-+ cpp_args = ['GUIX_GCC_PATH']
-+
- if 'cl' in cpp_args:
- # The Microsoft compiler/preprocessor (cl) does not accept
- # source input from stdin (the '-' flag), so we need
+Use gcc as the default C compiler if CC is not set.
+
+
+--- gobject-introspection-1.44.0.orig/giscanner/__init__.py 2014-08-04 22:37:07.000000000 +0800
++++ gobject-introspection-1.44.0/giscanner/__init__.py 2015-04-20 17:30:26.507697234 +0800
+@@ -22,3 +22,5 @@
+ builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
+ if builddir is not None:
+ __path__.append(os.path.join(builddir, 'giscanner'))
++if not 'CC' in os.environ:
++ os.environ['CC'] = 'gcc'
--
2.2.1
next reply other threads:[~2015-04-20 10:11 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-20 10:11 宋文武 [this message]
2015-04-20 10:11 ` [PATCH 2/7] gnu: itstool: Update to 2.0.2 宋文武
2015-04-20 10:11 ` [PATCH 3/7] gnu: dbus-glib: Update to 0.104 宋文武
2015-04-20 10:11 ` [PATCH 4/7] gnu: libsigc++: Update to 2.4.1 宋文武
2015-04-20 10:11 ` [PATCH 5/7] gnu: glibmm: Update to 2.44.0 宋文武
2015-04-20 10:12 ` [PATCH 6/7] gnu: python-pygobject: Update to 3.16.1 宋文武
2015-04-20 10:12 ` [PATCH 7/7] gnu: poppler: Update to 0.32.0 宋文武
2015-04-21 21:04 ` [PATCH 1/7] gnu: gobject-introspection: Update to 1.44.0 Ludovic Courtès
2015-04-22 2:03 ` 宋文武
2015-04-21 21:05 ` Ludovic Courtès
2015-04-21 21:15 ` Andreas Enge
2015-04-21 22:18 ` Mark H Weaver
2015-04-22 2:06 ` 宋文武
2015-04-22 12:06 ` Andreas Enge
2015-04-22 15:03 ` Mark H Weaver
2015-04-22 15:54 ` Andreas Enge
2015-04-22 21:00 ` Ludovic Courtès
2015-04-22 21:23 ` Mark H Weaver
2015-04-24 22:22 ` Mark H Weaver
2015-04-25 9:00 ` Mark H Weaver
2015-04-25 18:41 ` Andreas Enge
2015-04-26 0:00 ` 宋文武
2015-04-26 9:36 ` Andreas Enge
2015-04-26 14:07 ` Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1429524721-21449-1-git-send-email-iyzsong@gmail.com \
--to=iyzsong@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).