aboutsummaryrefslogtreecommitdiffstats
path: root/main/avahi-ui/system-avahi.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2014-05-14 14:55:45 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2014-05-14 15:05:23 +0000
commit79df80b23fcb065914d045cc68ebc355c5a7952d (patch)
treea936c2a1aa5c1231d4bc6202d76c3d708dabe156 /main/avahi-ui/system-avahi.patch
parentd47fd4efdbbbb95011b1001c2053413310a061a4 (diff)
main/avahi-ui: new aport
We splitted out the ui libs and tools to avoid the circular deps: avahi -> gtk -> cups -> avahi
Diffstat (limited to 'main/avahi-ui/system-avahi.patch')
-rw-r--r--main/avahi-ui/system-avahi.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/main/avahi-ui/system-avahi.patch b/main/avahi-ui/system-avahi.patch
new file mode 100644
index 00000000000..0f8a500da8d
--- /dev/null
+++ b/main/avahi-ui/system-avahi.patch
@@ -0,0 +1,30 @@
+--- ./avahi-ui/Makefile.am.orig
++++ ./avahi-ui/Makefile.am
+@@ -54,12 +54,12 @@
+ libavahi_ui_la_SOURCES = \
+ avahi-ui.h avahi-ui.c
+ libavahi_ui_la_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-libavahi_ui_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK20_LIBS)
++libavahi_ui_la_LIBADD = $(AM_LDADD) -lavahi-common -lavahi-client -lavahi-glib $(GTK20_LIBS)
+ libavahi_ui_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
+
+ libavahi_ui_gtk3_la_SOURCES = $(libavahi_ui_la_SOURCES)
+ libavahi_ui_gtk3_la_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+-libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) ../avahi-common/libavahi-common.la ../avahi-client/libavahi-client.la ../avahi-glib/libavahi-glib.la $(GTK30_LIBS)
++libavahi_ui_gtk3_la_LIBADD = $(AM_LDADD) -lavahi-common -lavahi-client -lavahi-glib $(GTK30_LIBS)
+ libavahi_ui_gtk3_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBAVAHI_UI_VERSION_INFO)
+
+ if HAVE_GDBM
+@@ -86,10 +86,10 @@
+
+ if HAVE_GTK3
+ bssh_CFLAGS = $(AM_CFLAGS) $(GTK30_CFLAGS)
+-bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui-gtk3.la
++bssh_LDADD = $(AM_LDADD) $(GTK30_LIBS) -lavahi-client -lavahi-common libavahi-ui-gtk3.la
+ else
+ bssh_CFLAGS = $(AM_CFLAGS) $(GTK20_CFLAGS)
+-bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) ../avahi-client/libavahi-client.la ../avahi-common/libavahi-common.la libavahi-ui.la
++bssh_LDADD = $(AM_LDADD) $(GTK20_LIBS) -lavahi-client -lavahi-common libavahi-ui.la
+ endif
+
+ install-exec-local: