← Back to branch summary

~ubuntu-desktop/gnome-control-center/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/revert_git_drop_library.patch

  • Committer: Martin Pitt
  • Author(s): Tim Lunn
  • Date: 2014-09-30 12:51:59 UTC
  • mfrom: (646.1.2 g-c-c)
  • Revision ID: martin.pitt@canonical.com-20140930125159-busza4a4mli50axi
merge with 1:3.12.1-5 from Debian

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/revert_git_drop_library.patch
29
29
 # Internationalization support
30
30
 
31
31
 IT_PROG_INTLTOOL([0.40.1])
32
 
@@ -326,9 +335,12 @@
 
32
@@ -334,9 +343,12 @@
33
33
 PANEL_CFLAGS="-I\$(top_srcdir)/ -DG_LOG_DOMAIN=\"\\\"\$(cappletname)-cc-panel\\\"\" -DPANEL_ID=\"\\\"\$(cappletname)\\\"\""
34
34
 AC_SUBST(PANEL_CFLAGS)
35
35
 
40
40
+PANEL_LDFLAGS="-export_dynamic -avoid-version -module -no-undefined -export-symbols-regex '^g_io_module_(load|unload)'"
41
41
+AC_SUBST(PANEL_LDFLAGS)
42
42
+
43
 
 dnl ==============================================
44
 
 dnl libsocialweb
45
 
 dnl ==============================================
46
 
@@ -426,6 +438,7 @@
 
43
 dnl =======================================
 
44
 dnl Update Mime Database
 
45
 dnl =======================================
 
46
@@ -416,6 +428,7 @@
47
47
 
48
48
 AC_CONFIG_FILES([
49
49
 Makefile
67
67
        $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name cc_common $<
68
68
--- a/shell/Makefile.am
69
69
+++ b/shell/Makefile.am
70
 
@@ -28,14 +28,8 @@
 
70
@@ -29,14 +29,8 @@
71
71
        cc-shell-category-view.h                \
72
72
        cc-shell-item-view.c                    \
73
73
        cc-shell-item-view.h                    \
84
84
        hostname-helper.c                       \
85
85
        hostname-helper.h                       \
86
86
        cc-hostname-entry.c                     \
87
 
@@ -44,8 +38,43 @@
 
87
@@ -45,8 +39,43 @@
88
88
 
89
89
 gnome_control_center_LDFLAGS = -export-dynamic
90
90
 
128
128
        $(SHELL_LIBS)                                                   \
129
129
        $(CHEESE_LIBS)                                                  \
130
130
        $(top_builddir)/libgd/libgd.la                                  \
131
 
@@ -99,6 +128,8 @@
 
131
@@ -107,6 +136,7 @@
132
132
 
133
133
 EXTRA_DIST =                                   \
134
134
        gnome-control-center.desktop.in.in      \
135
135
+       libgnome-control-center.pc.in           \
136
 
+       $(servicefile_in_files)                 \
 
136
        $(servicefile_in_files)                 \
137
137
        $(completion_in_files)                  \
138
138
        list-panel.sh
139
 
 
140
139
--- /dev/null
141
140
+++ b/shell/libgnome-control-center.pc.in
142
141
@@ -0,0 +1,12 @@
155
154
\ No newline at end of file
156
155
--- a/Makefile.am
157
156
+++ b/Makefile.am
158
 
@@ -34,6 +34,12 @@
 
157
@@ -35,6 +35,12 @@
159
158
 
160
159
 -include $(top_srcdir)/git.mk
161
160