Mercurial > mxe-octave

annotate src/gtkglarea-1-fixes.patch @ 2988:aca8511e7751

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt.mk: link to correct files in bin directory
author John W. Eaton <jwe@octave.org>
date Thu, 16 May 2013 13:32:57 -0400
parents a90c2311b6dc
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2673
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
1 This file is part of MXE.
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
2 See index.html for further information.
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
3
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
4 Contains ad hoc patches for cross building.
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
5
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
6 From 8ca212a3a9fa7a034b1fa3680422e9a7cad21d4a Mon Sep 17 00:00:00 2001
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
7 From: MXE
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
8 Date: Sun, 17 Jun 2012 09:05:56 +0200
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
9 Subject: [PATCH] deactivates dll build which is not supported by mxe, and
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
10 introduce option --disable-shared to handle it.
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
11
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
12 taken from
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
13 https://github.com/GNOME/gtkglarea/pull/1
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
14
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
15 diff --git a/configure.ac b/configure.ac
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
16 index 07be73f..2728c10 100644
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
17 --- a/configure.ac
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
18 +++ b/configure.ac
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
19 @@ -53,6 +53,16 @@ if test "$native_win32" = "yes"; then
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
20 fi
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
21 AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
22
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
23 +
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
24 +dnl
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
25 +dnl Check if shared libs are enabled
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
26 +dnl
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
27 +AC_ARG_ENABLE(shared,
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
28 + [AS_HELP_STRING([--disable-shared],[disable support for shared libraries])],
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
29 + [],
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
30 + [])
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
31 +AM_CONDITIONAL(USE_SHARED, test x$enable_shared != xno)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
32 +
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
33 dnl
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
34 dnl Check for GTK libraries
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
35 dnl
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
36 @@ -172,7 +182,7 @@ AC_C_CONST
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
37
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
38 dnl Checks for library functions.
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
39
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
40 -AC_OUTPUT(
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
41 +AC_CONFIG_FILES([
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
42 Makefile
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
43 gtkgl-2.0.pc
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
44 gtkgl/Makefile
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
45 @@ -180,8 +190,8 @@ AC_OUTPUT(
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
46 docs/Makefile
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
47 examples/Makefile
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
48 examples/makefile.mingw
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
49 -)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
50 -
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
51 +])
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
52 +AC_OUTPUT
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
53
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
54 echo "---"
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
55 echo "Configuration summary"
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
56 diff --git a/gtkgl/Makefile.am b/gtkgl/Makefile.am
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
57 index c7e65cd..23d4fdb 100644
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
58 --- a/gtkgl/Makefile.am
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
59 +++ b/gtkgl/Makefile.am
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
60 @@ -1,28 +1,28 @@
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
61 ## gtkgl directory
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
62
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
63 +INSTALL_EXTRA=
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
64 +UNINSTALL_EXTRA=
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
65 +
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
66 if OS_WIN32
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
67 export_symbols = -export-symbols gtkgl.def
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
68 -
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
69 +if USE_SHARED
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
70 install-libtool-import-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
71 $(INSTALL) .libs/libgtkgl-2.0.dll.a $(DESTDIR)$(libdir)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
72 uninstall-libtool-import-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
73 -rm $(DESTDIR)$(libdir)/libgtkgl-2.0.dll.a
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
74 -else
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
75 -install-libtool-import-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
76 -uninstall-libtool-import-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
77 +INSTALL_EXTRA += install-libtool-import-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
78 +UNINSTALL_EXTRA += uninstall-libtool-import-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
79 +endif
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
80 endif
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
81
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
82 if MS_LIB_AVAILABLE
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
83 noinst_DATA = gtkgl-2.0.lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
84 -
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
85 install-ms-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
86 $(INSTALL) gtkgl-2.0.lib $(DESTDIR)$(libdir)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
87 -
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
88 uninstall-ms-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
89 -rm $(DESTDIR)$(libdir)/gtkgl-2.0.lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
90 -else
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
91 -install-ms-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
92 -uninstall-ms-lib:
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
93 +INSTALL_EXTRA += install-ms-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
94 +UNINSTALL_EXTRA += uninstall-ms-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
95 endif
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
96
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
97 EXTRA_DIST = makefile.mingw makefile.mingw.in gtkgl.def
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
98 @@ -42,6 +42,6 @@ libgtkgl_2_0_la_LIBADD = $(GTK_LIBS) $(GL_LIBS)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
99 gtkgl-2.0.lib: libgtkgl-2.0.la gtkgl.def
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
100 lib -name:libgtkgl-2.0-@LT_CURRENT_MINUS_AGE@.dll -def:gtkgl.def -out:$@
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
101
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
102 -install-data-local: install-ms-lib install-libtool-import-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
103 +install-data-local: $(INSTALL_EXTRA)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
104
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
105 -uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
106 +uninstall-local: $(UNINSTALL_EXTRA)
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
107 --
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
108 1.7.9.5
a90c2311b6dc add package gtkglarea
William <r.3@libertysurf.fr>
parents:
diff changeset
109