Commit e4377dda authored by Felipe Borges's avatar Felipe Borges Committed by Benjamin Berg
Browse files

Add Flatpak manifest

Fixes #33
parent e0144d68
{
"app-id" : "org.gnome.NetworkDisplays",
"runtime" : "org.gnome.Platform",
"runtime-version" : "3.32",
"sdk" : "org.gnome.Sdk",
"command" : "gnome-network-displays",
"finish-args" : [
"--share=ipc",
"--share=network",
"--socket=x11",
"--socket=pulseaudio",
"--socket=session-bus",
"--socket=system-bus",
"--socket=wayland",
"--device=all"
],
"modules" : [
{
"name" : "gstreamer",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"sources" : [
{
"type" : "git",
"branch" : "1.14.2",
"url" : "git://anongit.freedesktop.org/gstreamer/gstreamer",
"commit" : "afb3d1b3e0d02da8b0eb5bb501356650b38e5644"
}
]
},
{
"name" : "gst-plugins-base",
"buildsystem" : "meson",
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"builddir" : true,
"sources" : [
{
"type" : "git",
"branch" : "1.14.2",
"url" : "git://anongit.freedesktop.org/gstreamer/gst-plugins-base",
"commit" : "24f097564657bd630e68931c932ec9fd992a3785"
}
]
},
{
"name" : "gst-plugins-good",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"sources" : [
{
"type" : "git",
"branch" : "1.14.2",
"url" : "git://anongit.freedesktop.org/gstreamer/gst-plugins-good",
"commit" : "4733e9715675d2dc52ed00e58d52388c56411cd2"
}
]
},
{
"name" : "gst-plugins-ugly",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"sources" : [
{
"type" : "git",
"branch" : "1.14.2",
"url" : "git://anongit.freedesktop.org/gstreamer/gst-plugins-ugly",
"commit" : "df1bcfa0ba57859eb39610ef53f1eb744ca57465"
}
]
},
{
"name" : "gst-plugins-bad",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"sources" : [
{
"type" : "git",
"branch" : "1.14.5",
"url" : "git://anongit.freedesktop.org/gstreamer/gst-plugins-bad.git",
"commit" : "dc1b94a15290172ffcc57c57f2b7ff6ee9322a5d"
}
]
},
{
"name" : "gst-rtsp-server",
"buildsystem" : "meson",
"builddir" : true,
"config-opts" : [
"-Ddisable_gtkdoc=true"
],
"sources" : [
{
"type" : "git",
"branch" : "1.14.5",
"url" : "https://gitlab.freedesktop.org/gstreamer/gst-rtsp-server.git",
"commit" : "1ad54eecfdf634ab6eb672c81df1602d004d75b8"
}
]
},
{
"name" : "udev",
"config-opts" : [
"--disable-hwdb",
"--disable-logging",
"--disable-gudev",
"--disable-introspection",
"--disable-keymap",
"--disable-mtd_probe"
],
"cleanup" : [
"/include",
"/etc",
"/libexec",
"/sbin",
"/lib/pkgconfig",
"/man",
"/share/aclocal",
"/share/doc",
"/share/gtk-doc",
"/share/man",
"/share/pkgconfig",
"*.la",
"*.a"
],
"sources" : [
{
"type" : "git",
"url" : "git://github.com/gentoo/eudev.git"
}
]
},
{
"name" : "libndp",
"buildsystem" : "autotools",
"sources" : [
{
"type" : "git",
"branch" : "v1.6",
"url" : "https://github.com/jpirko/libndp.git",
"commit" : "2f721c4ff519f38f46695a60d9f9d88f35bf3c1d"
}
]
},
{
"name" : "polkit",
"config-opts" : [
"--disable-polkitd",
"--disable-man-pages",
"--disable-introspection",
"--enable-libsystemd-login=no",
"--with-systemdsystemunitdir=no"
],
"rm-configure" : true,
"cleanup" : [
"/bin/*",
"/etc/pam.d",
"/etc/dbus-1",
"/share/dbus-1/system-services/*",
"/share/polkit-1",
"/lib/polkit-1"
],
"sources" : [
{
"type" : "archive",
"url" : "http://www.freedesktop.org/software/polkit/releases/polkit-0.113.tar.gz",
"sha256" : "e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81"
},
{
"type" : "patch",
"path" : "polkit-build-Add-option-to-build-without-polkitd.patch"
},
{
"type" : "file",
"path" : "polkit-autogen",
"dest-filename" : "autogen.sh"
}
]
},
{
"name" : "NetworkManager",
"buildsystem" : "meson",
"build-options" : {
"cflags" : "-ltinfo",
"cxxflags" : "-ltinfo"
},
"config-opts" : [
"-Dlibaudit=no",
"-Ddbus_conf_dir=/app/etc/dbus-1/system.d",
"-Ddbus_ifaces_dir=/app/share/dbus-1/interfaces",
"-Ddbus_sys_dir=/app/share/dbus-1/system.d",
"-Ddnsmasq=/usr/bin/true",
"-Ddocs=false",
"-Dintrospection=false",
"-Diptables=/usr/bin/true",
"-Djson_validation=false",
"-Dlibnm_glib=false",
"-Dlibpsl=false",
"-Dmodem_manager=false",
"-Dnmtui=false",
"-Dovs=false",
"-Dppp=false",
"-Dqt=false",
"-Dselinux=false",
"-Dsession_tracking=no",
"-Dsystemdsystemunitdir='no'",
"-Dsystemd_journal=false",
"-Dtests=no",
"-Dvapi=false",
"-Dwifi=true"
],
"sources" : [
{
"type" : "git",
"url" : "https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git"
}
]
},
{
"name" : "gnome-network-displays",
"buildsystem": "meson",
"sources" : [
{
"type" : "git",
"url" : "https://github.com/benzea/gnome-network-displays.git"
}
]
}
]
}
#!/bin/sh
gtkdocize --flavour no-tmpl
autoreconf -if
From dab179770380918462d0d76e08b11e4abe55c933 Mon Sep 17 00:00:00 2001
From: Patrick Griffis <tingping@tingping.se>
Date: Thu, 8 Sep 2016 16:15:54 -0400
Subject: [PATCH] build: Add option to build without polkitd
This is for any consumer that needs libpolkit but does
not need polkitd. For example an application running in
flatpak.
---
configure.ac | 29 ++++++++++++++++++++---------
src/Makefile.am | 6 +++++-
test/Makefile.am | 6 +++++-
3 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index 97d4222..a08785c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -129,20 +129,30 @@ AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_30],
AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,34)],
[Notify us when we'll need to transition away from g_type_init()])
+
+AC_ARG_ENABLE([polkitd],
+ [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])],
+ [enable_polkitd=$enableval], [enable_polkitd=yes])
+AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes])
+
+
AC_ARG_WITH(mozjs, AS_HELP_STRING([--with-mozjs=@<:@mozjs185/mozjs-17.0|auto@:>@],
[Specify version of Spidermonkey to use]),,
with_mozjs=auto)
-AS_IF([test x${with_mozjs} != xauto], [
- PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
-], [
- PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
- AS_IF([test x${have_mozjs185} = xno], [
- PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
- [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])])
+
+AS_IF([test x${enable_polkitd} = yes], [
+ AS_IF([test x${with_mozjs} != xauto], [
+ PKG_CHECK_MODULES(LIBJS, ${with_mozjs})
+ ], [
+ PKG_CHECK_MODULES(LIBJS, [mozjs185], have_mozjs185=yes, have_mozjs185=no)
+ AS_IF([test x${have_mozjs185} = xno], [
+ PKG_CHECK_MODULES(LIBJS, [mozjs-17.0], have_mozjs17=yes,
+ [AC_MSG_ERROR([Could not find mozjs185 or mozjs-17.0; see http://ftp.mozilla.org/pub/mozilla.org/js/])])
+ ])
])
+ AC_SUBST(LIBJS_CFLAGS)
+ AC_SUBST(LIBJS_LIBS)
])
-AC_SUBST(LIBJS_CFLAGS)
-AC_SUBST(LIBJS_LIBS)
EXPAT_LIB=""
AC_ARG_WITH(expat, [ --with-expat=<dir> Use expat from here],
@@ -605,6 +615,7 @@ echo "
Session tracking: ${SESSION_TRACKING}
PAM support: ${have_pam}
systemdsystemunitdir: ${systemdsystemunitdir}
+ polkitd: ${enable_polkitd}
polkitd user: ${POLKITD_USER}"
if test "$have_pam" = yes ; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 09fc7b3..c6fe91b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,9 @@
-SUBDIRS = polkit polkitbackend polkitagent programs
+SUBDIRS = polkit polkitagent programs
+
+if BUILD_POLKITD
+SUBDIRS += polkitbackend
+endif
if BUILD_EXAMPLES
SUBDIRS += examples
diff --git a/test/Makefile.am b/test/Makefile.am
index 59d0680..d43b0fe 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,11 @@
-SUBDIRS = mocklibc . polkit polkitbackend
+SUBDIRS = mocklibc . polkit
AM_CFLAGS = $(GLIB_CFLAGS)
+if BUILD_POLKITD
+SUBDIRS += polkitbackend
+endif
+
noinst_LTLIBRARIES = libpolkit-test-helper.la
libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h
libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS)
--
2.9.3
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment