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/desktop/libxklavier/patches/libxklavier-01-compile-makefile.patch
author Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
Mon, 03 Oct 2016 12:09:09 -0700
changeset 7038 ec6c9e486ce6
permissions -rw-r--r--
23245484 Move libxklavier 5.0 to Userland PSARC/2009/483 libxklavier re-integration
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
7038
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     1
 
Existing set of patches from the desktop gate for Solaris
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     2
 
Not suitable for upstream
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     3
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     4
 
--- libxklavier-5.0.orig/tests/Makefile.am	2010-06-01 15:52:32.355954665 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     5
 
+++ libxklavier-5.0/tests/Makefile.am	2010-06-01 15:54:24.239711266 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     6
 
@@ -4,7 +4,7 @@
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     7
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     8
 
 test_monitor_SOURCES=test_monitor.c
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
     9
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    10
 
-AM_CFLAGS=-Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    11
 
+AM_CFLAGS=-I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    12
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    13
 
 LDADD=$(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    14
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    15
 
--- libxklavier-5.0.orig/tests/Makefile.in	2010-06-01 15:52:32.356253578 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    16
 
+++ libxklavier-5.0/tests/Makefile.in	2010-06-01 15:54:33.471616942 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    17
 
@@ -210,7 +210,7 @@
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    18
 
 top_srcdir = @top_srcdir@
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    19
 
 test_config_SOURCES = test_config.c
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    20
 
 test_monitor_SOURCES = test_monitor.c
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    21
 
-AM_CFLAGS = -Wall -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    22
 
+AM_CFLAGS = -I$(top_srcdir) $(X_CFLAGS) $(GLIB_CFLAGS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    23
 
 LDADD = $(top_builddir)/libxklavier/libxklavier.la $(X_LIBS) $(GLIB_LIBS)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    24
 
 all: all-am
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    25
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    26
 
--- libxklavier-5.0.orig/libxklavier/Makefile.am	2009-06-28 15:07:27.000000000 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    27
 
+++ libxklavier-5.0/libxklavier/Makefile.am	2012-06-05 14:09:29.819059363 +0200
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    28
 
@@ -15,12 +15,13 @@
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    29
 
   ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    30
 
 endif
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    31
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    32
 
-AM_CFLAGS=-Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    33
 
+AM_CFLAGS=-DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    34
 
   -I. -I$(top_srcdir) $(X_CFLAGS) \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    35
 
   $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    36
 
   $(LIBXKBFILE_PRESENT_CFLAG) \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    37
 
   $(ENABLE_XKB_SUPPORT_CFLAG) \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    38
 
-  $(ENABLE_XMODMAP_SUPPORT_CFLAG)
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    39
 
+  $(ENABLE_XMODMAP_SUPPORT_CFLAG) \
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    40
 
+  -DLOCALEDIR=\"$(datadir)/locale\"
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    41
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    42
 
 lib_LTLIBRARIES = libxklavier.la
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    43
 
 noinst_HEADERS = xklavier_private.h xklavier_private_xkb.h xklavier_private_xmm.h
ec6c9e486ce6 23245484 Move libxklavier 5.0 to Userland
Alan Coopersmith <Alan.Coopersmith@Oracle.COM>
parents:
diff changeset 
    44
 












ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    45


--- libxklavier-5.0.orig/libxklavier/Makefile.in	2010-06-01 16:01:01.278962526 +0200













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    46


+++ libxklavier-5.0/libxklavier/Makefile.in	2010-06-01 16:01:49.876322985 +0200













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    47


@@ -224,7 +224,7 @@













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    48


 @ENABLE_XKB_SUPPORT_TRUE@ENABLE_XKB_SUPPORT_CFLAG = -DENABLE_XKB_SUPPORT=1













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    49


 @ENABLE_XMODMAP_SUPPORT_FALSE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DDISABLE_XMODMAP_SUPPORT=1













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    50


 @ENABLE_XMODMAP_SUPPORT_TRUE@ENABLE_XMODMAP_SUPPORT_CFLAG = -DENABLE_XMODMAP_SUPPORT=1













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    51


-AM_CFLAGS = -Wall -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    52


+AM_CFLAGS = -DDATA_DIR=\"$(datadir)/$(PACKAGE)\" \













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    53


   -I. -I$(top_srcdir) $(X_CFLAGS) \













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    54


   $(XML_CFLAGS) $(GLIB_CFLAGS) $(XINPUT_CFLAGS) \













ec6c9e486ce6
23245484 Move libxklavier 5.0 to Userland



Alan Coopersmith <Alan.Coopersmith@Oracle.COM>


parents: 

diff
changeset




    55


   $(LIBXKBFILE_PRESENT_CFLAG) \















upstream/oracle/userland-gate