From 79df80b23fcb065914d045cc68ebc355c5a7952d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 14 May 2014 14:55:45 +0000 Subject: main/avahi-ui: new aport We splitted out the ui libs and tools to avoid the circular deps: avahi -> gtk -> cups -> avahi --- main/avahi-ui/system-avahi.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 main/avahi-ui/system-avahi.patch (limited to 'main/avahi-ui/system-avahi.patch') diff --git a/main/avahi-ui/system-avahi.patch b/main/avahi-ui/system-avahi.patch new file mode 100644 index 0000000000..0f8a500da8 --- /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: -- cgit v1.2.3