gnu: gobject-introspection: Update to 1.72.0.
* gnu/packages/glib.scm (gobject-introspection): Update to 1.72.0. * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch, gnu/packages/patches/gobject-introspection-cc.patch: Rebase.
This commit is contained in:
		
							parent
							
								
									413888ffea
								
							
						
					
					
						commit
						13d858413c
					
				
					 3 changed files with 9 additions and 25 deletions
				
			
		|  | @ -459,14 +459,14 @@ be used when cross-compiling." | ||||||
| (define gobject-introspection | (define gobject-introspection | ||||||
|   (package |   (package | ||||||
|     (name "gobject-introspection") |     (name "gobject-introspection") | ||||||
|     (version "1.68.0") |     (version "1.72.0") | ||||||
|     (source (origin |     (source (origin | ||||||
|              (method url-fetch) |              (method url-fetch) | ||||||
|              (uri (string-append "mirror://gnome/sources/" |              (uri (string-append "mirror://gnome/sources/" | ||||||
|                    "gobject-introspection/" (version-major+minor version) |                    "gobject-introspection/" (version-major+minor version) | ||||||
|                    "/gobject-introspection-" version ".tar.xz")) |                    "/gobject-introspection-" version ".tar.xz")) | ||||||
|              (sha256 |              (sha256 | ||||||
|               (base32 "09sawnv3xj9pzgy2qrrk87dl3jibfphnswb61i5bh0d2h4j28afj")) |               (base32 "1g5aps3b20ck96ahy7fjl4nhp9nabkd9rlqd0s1qzn3111cqxzh2")) | ||||||
|              (patches (search-patches |              (patches (search-patches | ||||||
|                        "gobject-introspection-cc.patch" |                        "gobject-introspection-cc.patch" | ||||||
|                        "gobject-introspection-girepository.patch" |                        "gobject-introspection-girepository.patch" | ||||||
|  |  | ||||||
|  | @ -6,15 +6,9 @@ for 'gobject-introspection' 1.40.0 in Nix. | ||||||
| 
 | 
 | ||||||
| It has since been updated to work with newer versions of | It has since been updated to work with newer versions of | ||||||
| gobject-introspection. | gobject-introspection. | ||||||
| ---
 |  | ||||||
|  giscanner/scannermain.py     | 37 ++++++++++++++++++++++++++++++++++++ |  | ||||||
|  giscanner/shlibs.py          | 30 ++++++++++++++++++++--------- |  | ||||||
|  giscanner/utils.py           | 15 +++++---------- |  | ||||||
|  tests/scanner/test_shlibs.py |  3 ++- |  | ||||||
|  4 files changed, 65 insertions(+), 20 deletions(-) |  | ||||||
| 
 | 
 | ||||||
| diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
 | diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
 | ||||||
| index 957ba0b7..78f9b11b 100644
 | index 1d39ab84..e12ed24e 100644
 | ||||||
| --- a/giscanner/scannermain.py
 | --- a/giscanner/scannermain.py
 | ||||||
| +++ b/giscanner/scannermain.py
 | +++ b/giscanner/scannermain.py
 | ||||||
| @@ -95,6 +95,39 @@ def get_windows_option_group(parser):
 | @@ -95,6 +95,39 @@ def get_windows_option_group(parser):
 | ||||||
|  | @ -57,10 +51,10 @@ index 957ba0b7..78f9b11b 100644 | ||||||
|  def _get_option_parser(): |  def _get_option_parser(): | ||||||
|      parser = optparse.OptionParser('%prog [options] sources', |      parser = optparse.OptionParser('%prog [options] sources', | ||||||
|                                     version='%prog ' + giscanner.__version__) |                                     version='%prog ' + giscanner.__version__) | ||||||
| @@ -214,6 +247,10 @@ match the namespace prefix.""")
 | @@ -220,6 +253,10 @@ match the namespace prefix.""")
 | ||||||
|      parser.add_option("", "--filelist", |      parser.add_option("", "--compiler", | ||||||
|                        action="store", dest="filelist", default=[], |                        action="store", dest="compiler", default=None, | ||||||
|                        help="file containing headers and sources to be scanned") |                        help="the C compiler to use internally") | ||||||
| +    parser.add_option("", "--fallback-library-path",
 | +    parser.add_option("", "--fallback-library-path",
 | ||||||
| +                      action="store", dest="fallback_libpath",
 | +                      action="store", dest="fallback_libpath",
 | ||||||
| +                      default=_get_default_fallback_libpath(),
 | +                      default=_get_default_fallback_libpath(),
 | ||||||
|  | @ -138,10 +132,10 @@ index 9f8ab5df..8aa37c99 100644 | ||||||
|                      del patterns[library] |                      del patterns[library] | ||||||
|                      shlibs.append(m.group()) |                      shlibs.append(m.group()) | ||||||
| diff --git a/giscanner/utils.py b/giscanner/utils.py
 | diff --git a/giscanner/utils.py b/giscanner/utils.py
 | ||||||
| index 45807f17..8a319cd1 100644
 | index 31c7ea48..630002a8 100644
 | ||||||
| --- a/giscanner/utils.py
 | --- a/giscanner/utils.py
 | ||||||
| +++ b/giscanner/utils.py
 | +++ b/giscanner/utils.py
 | ||||||
| @@ -113,16 +113,11 @@ def extract_libtool_shlib(la_file):
 | @@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
 | ||||||
|      if dlname is None: |      if dlname is None: | ||||||
|          return None |          return None | ||||||
|   |   | ||||||
|  | @ -177,6 +171,3 @@ index a8337c60..7f123103 100644 | ||||||
|   |   | ||||||
|      def test_unresolved_library(self): |      def test_unresolved_library(self): | ||||||
|          output = '' |          output = '' | ||||||
| -- 
 |  | ||||||
| 2.33.0 |  | ||||||
| 
 |  | ||||||
|  |  | ||||||
|  | @ -1,9 +1,5 @@ | ||||||
| Use gcc as the default C compiler if CC is not set. | Use gcc as the default C compiler if CC is not set. | ||||||
| 
 | 
 | ||||||
| ---
 |  | ||||||
|  giscanner/__init__.py | 2 ++ |  | ||||||
|  1 file changed, 2 insertions(+) |  | ||||||
| 
 |  | ||||||
| diff --git a/giscanner/__init__.py b/giscanner/__init__.py
 | diff --git a/giscanner/__init__.py b/giscanner/__init__.py
 | ||||||
| index 7c2f365a..607fe341 100644
 | index 7c2f365a..607fe341 100644
 | ||||||
| --- a/giscanner/__init__.py
 | --- a/giscanner/__init__.py
 | ||||||
|  | @ -17,6 +13,3 @@ index 7c2f365a..607fe341 100644 | ||||||
|  try: |  try: | ||||||
|      from ._version import __version__ |      from ._version import __version__ | ||||||
|  except ImportError: |  except ImportError: | ||||||
| -- 
 |  | ||||||
| 2.33.0 |  | ||||||
| 
 |  | ||||||
|  |  | ||||||
		Reference in a new issue