From 79df80b23fcb065914d045cc68ebc355c5a7952d Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 14 May 2014 14:55:45 +0000 Subject: [PATCH] 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/APKBUILD | 107 ++++++++++++++++++ .../avahi-0.6.31-no-deprecations.patch | 100 ++++++++++++++++ main/avahi-ui/gnome-nettool.png | Bin 0 -> 4509 bytes main/avahi-ui/musl-fix.patch | 65 +++++++++++ main/avahi-ui/system-avahi.patch | 30 +++++ 5 files changed, 302 insertions(+) create mode 100644 main/avahi-ui/APKBUILD create mode 100644 main/avahi-ui/avahi-0.6.31-no-deprecations.patch create mode 100644 main/avahi-ui/gnome-nettool.png create mode 100644 main/avahi-ui/musl-fix.patch create mode 100644 main/avahi-ui/system-avahi.patch diff --git a/main/avahi-ui/APKBUILD b/main/avahi-ui/APKBUILD new file mode 100644 index 00000000000..146e1a0c73d --- /dev/null +++ b/main/avahi-ui/APKBUILD @@ -0,0 +1,107 @@ +# Maintainer: Natanael Copa +pkgname=avahi-ui +pkgver=0.6.31 +pkgrel=5 +pkgdesc="Gtk user interface library for Avahi" +url="http://www.avahi.org/" +arch="all" +license="LGPL2+" +depends="" +depends_dev="gtk+3.0-dev gtk+2.0-dev gdbm-dev avahi-dev" +makedepends="$depends_dev py-gobject3-dev py-gtk-dev py-dbus-dev intltool + gobject-introspection-dev expat-dev libdaemon-dev glib-dev dbus-dev + libcap-dev py-gdbm + autoconf automake libtool" +install="" +subpackages="$pkgname-dev $pkgname-tools $pkgname-gtk3" +patches="musl-fix.patch + avahi-0.6.31-no-deprecations.patch + system-avahi.patch" +source="http://www.avahi.org/download/avahi-$pkgver.tar.gz + $patches + gnome-nettool.png" + +_subdirs="avahi-ui avahi-python" +_builddir="$srcdir"/avahi-$pkgver +prepare() { + cd "$_builddir" + for i in $patches; do + patch -p1 -i "$srcdir"/$i || return 1 + done + update_config_sub || return 1 + libtoolize --force && aclocal -I m4 && autoconf \ + && automake --add-missing +} + +build() { + cd "$_builddir" + # we dont build autoipd since dhcpcd does same job + ./configure \ + --build=$CBUILD \ + --host=$CHOST \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --disable-autoipd \ + --disable-qt3 \ + --disable-qt4 \ + --enable-gtk3 \ + --disable-mono \ + --disable-monodoc \ + --disable-doxygen-doc \ + --disable-xmltoman \ + --disable-compat-libdns_sd \ + --disable-compat-howl \ + --with-distro="gentoo" \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --disable-static \ + --enable-shared \ + || return 1 + for i in $_subdirs; do + (cd $i && make) || return 1 + done +} + +package() { + cd "$_builddir" + mkdir -p "$pkgdir"/usr/bin || return 1 + for i in avahi-ui avahi-python; do + ( cd $i && make DESTDIR="$pkgdir" install) || return 1 + done + rm -r "$pkgdir"/usr/lib/*.la \ + "$pkgdir"/usr/lib/py* || return 1 +} + +tools() { + pkgdesc="UI tools for mDNS browsing" + depends="py-gtk py-dbus py-gdbm py-avahi" + mkdir -p "$subpkgdir"/usr/bin + cd "$pkgdir"/usr/bin + mv avahi-bookmarks avahi-discover avahi-discover-standalone b* \ + "$subpkgdir"/usr/bin/ + install -D -m 644 "$srcdir"/gnome-nettool.png \ + "$subpkgdir"/usr/share/pixmaps/gnome-nettool.png +} + +gtk3() { + pkgdesc="Gtk3 user interface library for Avahi" + mkdir -p "$subpkgdir"/usr/lib + mv "$pkgdir"/usr/lib/libavahi-ui-gtk3.so.* \ + "$subpkgdir"/usr/lib/ +} + +md5sums="2f22745b8f7368ad5a0a3fddac343f2d avahi-0.6.31.tar.gz +9557450128d0e4324405af2c625dc8c7 musl-fix.patch +c3f9cdb20bfbaa575f86e2fe4a7783bf avahi-0.6.31-no-deprecations.patch +880936938b6793b5fe675622eb513838 system-avahi.patch +42c2905307c7a5dc6ac4b75f4c3d65a3 gnome-nettool.png" +sha256sums="8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48 avahi-0.6.31.tar.gz +c43a60cf9cddb3cc8c88c13d78dbf0c6a7f1e3ff1f73e1305d465547cadd6a58 musl-fix.patch +a30a5c3fbf07e1035021f92735ef7cbfbfd6e5a2324daca4cd034321f037ec9d avahi-0.6.31-no-deprecations.patch +7731752997475c358129d6f716b1b76e715642c21184844666f51a3b040a12d8 system-avahi.patch +88cbac3316fd0ad10bb7d054dcd53ab822517a1d9bbb70a31cd754dcd59e94b9 gnome-nettool.png" +sha512sums="53eb00d570a274d841e1e6ad07da077950089ae39b4f7aa21fcd21cc5320b30b506b43e7e57e56198e155cc7bd289b779a48b2b2fc002dc6194a946110451858 avahi-0.6.31.tar.gz +09ae19b3c8641cdbeaabf1af69852e297d7445dfaf259b43d9de8a04c5d31722ecb2fb921feb44925a5364e69bd514c47be90f532493b087879abf9f53a8fe11 musl-fix.patch +488699dd1d3cc39c4efc972ac6e9afa306208a23fe028454951c8009a34f974dbd19f16d6737bfea93660559728080508e06e32de0718db4f2dda9624031002a avahi-0.6.31-no-deprecations.patch +99723e66889601044ac5ca919e79aa328083cb377bb3d270f3e8d2baee27505f967949f72faa0424756e5f18b1359fd7f7fb30636861d47455ff7b92ed48bcfa system-avahi.patch +d8e92fcdd82759f8de536ebfa356fe208c27b2d998ce5bb51d585dffc163dc16228be4a7108644fe1a11defbe750244bc8105a430b1397297cdef4cb83ab0db5 gnome-nettool.png" diff --git a/main/avahi-ui/avahi-0.6.31-no-deprecations.patch b/main/avahi-ui/avahi-0.6.31-no-deprecations.patch new file mode 100644 index 00000000000..83b13cda65c --- /dev/null +++ b/main/avahi-ui/avahi-0.6.31-no-deprecations.patch @@ -0,0 +1,100 @@ + + + +avahi.git - avahi + + + + + + + +
+ + + + +
+summaryrefslogtreecommitdiffstats
+ + + +
+
+
path: root/avahi-0.6.31-no-deprecations.patch
blob: 9ca9d38dec7cfc91b5446d6f2da21c847703cb54 (plain) + + +
1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
+21
+22
+
--- avahi-0.6.31/avahi-ui/Makefile.am.orig	2013-09-21 16:47:28.677659361 +0200
++++ avahi-0.6.31/avahi-ui/Makefile.am	2013-09-21 16:47:34.852520537 +0200
+@@ -15,7 +15,7 @@
+ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ # USA.
+ 
+-AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1
++AM_CFLAGS=-I$(top_srcdir)
+ 
+ # This cool debug trap works on i386/gcc only
+ AM_CFLAGS+='-DDEBUG_TRAP=__asm__("int $$3")'
+--- avahi-0.6.31/configure.ac.orig	2013-09-21 16:46:43.750669413 +0200
++++ avahi-0.6.31/configure.ac	2013-09-21 16:47:02.566246400 +0200
+@@ -92,7 +92,7 @@
+     AC_MSG_CHECKING([whether stack-smashing protection is available])
+     ssp_old_cflags="$CFLAGS"
+     ssp_old_ldflags="$LDFLAGS"
+-    CFLAGS="$CFLAGS -Werror -fstack-protector-all -fPIC"
++    CFLAGS="$CFLAGS -fstack-protector-all -fPIC"
+     LDFLAGS="$LDFLAGS -Wl,-z,defs"
+     cat confdefs.h > conftest.c
+     cat >>conftest.c <<_ACEOF
+
+
+
generated by cgit v0.10.1 at 2014-05-14 13:49:24 (GMT)
+
+ + diff --git a/main/avahi-ui/gnome-nettool.png b/main/avahi-ui/gnome-nettool.png new file mode 100644 index 0000000000000000000000000000000000000000..227d0678a3a185d3e9925b19c29432a52bd521a3 GIT binary patch literal 4509 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 literal 0 HcmV?d00001 diff --git a/main/avahi-ui/musl-fix.patch b/main/avahi-ui/musl-fix.patch new file mode 100644 index 00000000000..a331e6453cb --- /dev/null +++ b/main/avahi-ui/musl-fix.patch @@ -0,0 +1,65 @@ +diff --git a/avahi-common/simple-watch.c b/avahi-common/simple-watch.c +index 8df18dd..08d8090 100644 +--- a/avahi-common/simple-watch.c ++++ b/avahi-common/simple-watch.c +@@ -21,7 +21,7 @@ + #include + #endif + +-#include ++#include + #include + #include + #include +diff --git a/avahi-common/simple-watch.h b/avahi-common/simple-watch.h +index 72c1905..db87122 100644 +--- a/avahi-common/simple-watch.h ++++ b/avahi-common/simple-watch.h +@@ -22,7 +22,7 @@ + + /** \file simple-watch.h Simple poll() based main loop implementation */ + +-#include ++#include + #include + #include + +diff --git a/avahi-common/thread-watch.c b/avahi-common/thread-watch.c +index c0cadeb..ecb202b 100644 +--- a/avahi-common/thread-watch.c ++++ b/avahi-common/thread-watch.c +@@ -21,7 +21,7 @@ + #include + #endif + +-#include ++#include + #include + #include + #include +diff --git a/avahi-common/thread-watch.h b/avahi-common/thread-watch.h +index dec0cf3..1b44ccb 100644 +--- a/avahi-common/thread-watch.h ++++ b/avahi-common/thread-watch.h +@@ -22,7 +22,7 @@ + + /** \file thread-watch.h Threaded poll() based main loop implementation */ + +-#include ++#include + #include + #include + +diff --git a/avahi-common/watch.h b/avahi-common/watch.h +index 86e63d3..eea12ec 100644 +--- a/avahi-common/watch.h ++++ b/avahi-common/watch.h +@@ -22,7 +22,7 @@ + + /** \file watch.h Simplistic main loop abstraction */ + +-#include ++#include + #include + + #include 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: