Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/gnome/clutter-gst/patches/00-gobject-introspection.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Tue, 12 Jul 2016 13:07:04 +0000
changeset 6392 e08951796d20
permissions -rw-r--r--
23245282 Move clutter-gst to Userland and update to 2.0.16 PSARC/2016/396 GNOME 3 Window Manager Bundle
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
6392
e08951796d20 23245282 Move clutter-gst to Userland and update to 2.0.16
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     1
 
Ultimately, this should be resolved by using Makefile.introspection.
e08951796d20 23245282 Move clutter-gst to Userland and update to 2.0.16
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     2
 












e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     3


The patch below a simpler fix that does the minimum necessary to make













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     4


introspection builds work.













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     5














e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     6


XXX file upstream bug













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     7














e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     8


--- clutter-gst-2.0.14/build/autotools/introspection.m4	2014-10-19 04:41:57.000000000 -0700













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




     9


+++ clutter-gst-2.0.14/build/autotools/introspection.m4	2015-06-02 12:37:14.807600738 -0700













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    10


@@ -49,12 +49,14 @@













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    11


     AC_MSG_RESULT([$found_introspection])













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    12


 













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    13


     INTROSPECTION_SCANNER=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    14


+    INTROSPECTION_SCANNER_ENV=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    15


     INTROSPECTION_COMPILER=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    16


     INTROSPECTION_GENERATE=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    17


     INTROSPECTION_GIRDIR=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    18


     INTROSPECTION_TYPELIBDIR=













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    19


     if test "x$found_introspection" = "xyes"; then













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    20


        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    21


+       INTROSPECTION_SCANNER_ENV='CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)"'













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    22


        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    23


        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    24


        INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    25


@@ -64,6 +66,7 @@













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    26


        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    27


     fi













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    28


     AC_SUBST(INTROSPECTION_SCANNER)













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    29


+    AC_SUBST(INTROSPECTION_SCANNER_ENV)













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    30


     AC_SUBST(INTROSPECTION_COMPILER)













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    31


     AC_SUBST(INTROSPECTION_GENERATE)













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    32


     AC_SUBST(INTROSPECTION_GIRDIR)













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    33


--- clutter-gst-2.0.14/clutter-gst/Makefile.am	2015-01-25 07:02:49.000000000 -0800













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    34


+++ clutter-gst-2.0.14/clutter-gst/Makefile.am	2015-06-26 13:57:36.932028090 -0700













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    35


@@ -124,6 +124,7 @@













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    36


 ClutterGst-@[email protected]: $(INTROSPECTION_SCANNER) libclutter-gst-@[email protected]













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    37


 	$(QUIET_GEN) \













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    38


 		GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no DISPLAY="" \













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    39


+		$(INTROSPECTION_SCANNER_ENV) \













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    40


 		$(INTROSPECTION_SCANNER) -v \













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    41


 		--namespace ClutterGst --nsversion=@CLUTTER_GST_API_VERSION@ \













e08951796d20
23245282 Move clutter-gst to Userland and update to 2.0.16



Niveditha Rau <Niveditha.Rau@Oracle.COM>


parents: 

diff
changeset




    42


 		$(INCLUDES) \















upstream/oracle/userland-gate