[totem/gnome-3-22] flatpak: Move flatpak build definition in-tree
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem/gnome-3-22] flatpak: Move flatpak build definition in-tree
- Date: Sun, 5 Mar 2017 03:28:20 +0000 (UTC)
commit f313ac3f2b4012a4e040a0b77f163417b0418970
Author: Bastien Nocera <hadess hadess net>
Date: Sun Mar 5 04:28:01 2017 +0100
flatpak: Move flatpak build definition in-tree
See https://wiki.gnome.org/Initiatives/GnomeGoals/FlatpakManifests
flatpak/lua-5.3.0-autotoolize.patch | 192 +++++++++++++++++++++++++++
flatpak/lua-5.3.0-idsize.patch | 12 ++
flatpak/org.gnome.Totem.json | 250 +++++++++++++++++++++++++++++++++++
flatpak/org.lua.modules.json | 28 ++++
4 files changed, 482 insertions(+), 0 deletions(-)
---
diff --git a/flatpak/lua-5.3.0-autotoolize.patch b/flatpak/lua-5.3.0-autotoolize.patch
new file mode 100644
index 0000000..3e4723a
--- /dev/null
+++ b/flatpak/lua-5.3.0-autotoolize.patch
@@ -0,0 +1,192 @@
+diff -up lua-5.3.0/configure.ac.autoxxx lua-5.3.0/configure.ac
+--- lua-5.3.0/configure.ac.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/configure.ac 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,69 @@
++AC_PREREQ(2.59)
++AC_INIT([lua], [5.3.0], [https://bugzilla.redhat.com/], [lua-at], [http://www.lua.org])
++AC_SUBST([MAJOR_VERSION], [5.3])
++
++AC_CONFIG_HEADERS([config.h])
++AC_CONFIG_SRCDIR([src/lapi.c])
++
++AM_INIT_AUTOMAKE([1.9 foreign])
++
++AC_PROG_CC
++AC_PROG_LIBTOOL
++
++AC_ARG_WITH(
++ [readline],
++ [AC_HELP_STRING([--with-readline], [Use readline for interpreter input [default=yes]])],
++ [use_readline=$withval],
++ [use_readline=yes]
++)
++
++LUA_LIBS="-lm"
++
++# Check for readline
++READLINE_DEFS="#undef LUA_USE_READLINE"
++if test "x$use_readline" == "xyes"; then
++ AC_CHECK_LIB([readline], [readline], [:], [use_readline=no], [-lncurses])
++ AC_CHECK_HEADERS([readline/readline.h readline/history.h], [], [use_readline=no])
++ if test "x$use_readline" == "xno"; then
++ AC_MSG_WARN([readline headers could not be found, disabling readline support])
++ else
++ READLINE_DEFS="#define LUA_USE_READLINE"
++ READLINE_LIBS="-lreadline -lncurses"
++ fi
++fi
++AC_SUBST(READLINE_DEFS)
++AC_SUBST(READLINE_LIBS)
++
++case "$host" in
++ *-mingw*) use_os=win32 ;;
++ *-darwin*) use_os=macosx ;;
++ *) use_os=posix ;;
++esac
++
++POSIX_DEFS="#undef LUA_USE_POSIX"
++LUA_DL_DEFS="#undef LUA_USE_DLOPEN"
++LUA_BUILD_AS_DLL_DEFS="#undef LUA_BUILD_AS_DLL"
++
++if test "x$use_os" == "xwin32"; then
++ LUA_BUILD_AS_DLL_DEFS="#define LUA_BUILD_AS_DLL"
++elif test "x$use_os" == "xmacosx"; then
++ POSIX_DEFS="#define LUA_USE_POSIX"
++ LUA_DL_DEFS="#define LUA_DL_DYLD"
++elif test "x$use_os" == "xposix"; then
++ POSIX_DEFS="#define LUA_USE_POSIX"
++ LUA_DL_DEFS="#define LUA_DL_DLOPEN"
++ LUA_LIBS="$LUA_LIBS -ldl"
++fi
++AC_SUBST(POSIX_DEFS)
++AC_SUBST(LUA_DL_DEFS)
++AC_SUBST(LUA_BUILD_AS_DLL_DEFS)
++
++AC_SUBST(LUA_LIBS)
++
++AC_CONFIG_FILES([Makefile
++ src/Makefile
++ src/lua.pc
++ src/luaconf.h.template
++ doc/Makefile
++])
++AC_OUTPUT
+diff -up lua-5.3.0/doc/Makefile.am.autoxxx lua-5.3.0/doc/Makefile.am
+--- lua-5.3.0/doc/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/doc/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,4 @@
++man1_MANS = lua.1 luac.1
++
++EXTRA_DIST = \
++ contents.html logo.gif lua.1 luac.1 lua.css manual.css manual.html osi-certified-72x60.png readme.html
+diff -up lua-5.3.0/Makefile.am.autoxxx lua-5.3.0/Makefile.am
+--- lua-5.3.0/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,3 @@
++SUBDIRS = src doc
++
++EXTRA_DIST = README
+diff -up lua-5.3.0/src/.gitignore.autoxxx lua-5.3.0/src/.gitignore
+--- lua-5.3.0/src/.gitignore.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/.gitignore 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,5 @@
++lua
++lua.pc
++luac
++luaconf.h
++luaconf.h.template
+diff -up lua-5.3.0/src/luaconf.h.template.in.autoxxx lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.autoxxx 2015-01-15 10:20:03.828889562 -0500
++++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:22:37.420027778 -0500
+@@ -11,6 +11,11 @@
+ #include <limits.h>
+ #include <stddef.h>
+
++@POSIX_DEFS@
++@LUA_DL_DEFS@
++@LUA_BUILD_AS_DLL_DEFS@
++@READLINE_DEFS@
++
+
+ /*
+ ** ===================================================================
+@@ -175,9 +180,9 @@
+
+ #else /* }{ */
+
+-#define LUA_ROOT "/usr/local/"
+-#define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/"
+-#define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/"
++#define LUA_ROOT "@prefix@/"
++#define LUA_LDIR "@pkgdatadir@/lua/" LUA_VDIR "/"
++#define LUA_CDIR "@libdir@/lua/" LUA_VDIR "/"
+ #define LUA_PATH_DEFAULT \
+ LUA_LDIR"?.lua;" LUA_LDIR"?/init.lua;" \
+ LUA_CDIR"?.lua;" LUA_CDIR"?/init.lua;" \
+diff -up lua-5.3.0/src/lua.pc.in.autoxxx lua-5.3.0/src/lua.pc.in
+--- lua-5.3.0/src/lua.pc.in.autoxxx 2015-01-15 10:20:03.827889568 -0500
++++ lua-5.3.0/src/lua.pc.in 2015-01-15 10:20:03.827889568 -0500
+@@ -0,0 +1,13 @@
++V= @MAJOR_VERSION@
++R= @VERSION@
++prefix= @prefix@
++exec_prefix=${prefix}
++libdir= @libdir@
++includedir=${prefix}/include
++
++Name: Lua
++Description: An Extensible Extension Language
++Version: ${R}
++Requires:
++Libs: -llua @LUA_LIBS@
++Cflags: -I${includedir}
+diff -up lua-5.3.0/src/Makefile.am.autoxxx lua-5.3.0/src/Makefile.am
+--- lua-5.3.0/src/Makefile.am.autoxxx 2015-01-15 10:20:03.826889574 -0500
++++ lua-5.3.0/src/Makefile.am 2015-01-15 10:20:03.826889574 -0500
+@@ -0,0 +1,46 @@
++AM_CFLAGS = -Wall
++
++include_HEADERS = lua.h lualib.h lauxlib.h lua.hpp
++
++nodist_include_HEADERS = luaconf.h
++
++lib_LTLIBRARIES = liblua.la
++liblua_la_LDFLAGS = -release @MAJOR_VERSION@
++liblua_la_SOURCES = \
++ lapi.c lauxlib.c lbaselib.c lbitlib.c lcode.c lcorolib.c lctype.c ldblib.c \
++ ldebug.c ldo.c ldump.c lfunc.c lgc.c linit.c liolib.c llex.c lmathlib.c lmem.c \
++ loadlib.c lobject.c lopcodes.c loslib.c lparser.c lstate.c lstring.c lstrlib.c \
++ ltable.c ltablib.c ltm.c lundump.c lutf8lib.c lvm.c lzio.c \
++ lapi.h lcode.h lctype.h ldebug.h ldo.h lfunc.h lgc.h llex.h llimits.h \
++ lmem.h lobject.h lopcodes.h lparser.h lstate.h lstring.h ltable.h ltm.h \
++ lundump.h lvm.h lzio.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = lua.pc
++
++bin_PROGRAMS = lua luac
++
++lua_SOURCES = lua.c
++lua_LDADD = liblua.la @LUA_LIBS@ @READLINE_LIBS@
++lua_DEPENDENCIES = liblua.la
++
++luac_SOURCES = luac.c
++# Statically link liblua against luac since luac uses symbols not exported in liblua
++luac_LDADD = .libs/liblua.a @LUA_LIBS@
++luac_DEPENDENCIES = liblua.la
++
++EXTRA_DIST = luaconf.h.template
++BUILT_SOURCES = luaconf.h
++CLEANFILES = luaconf.h luaconf.h.template
++
++readline_defs = @READLINE_DEFS@
++
++edit = sed \
++ -e 's,%prefix%,$(prefix),g' \
++ -e 's,%lua_datadir%,$(datadir),g' \
++ -e 's,%lua_libdir%,$(libdir),g'
++
++luaconf.h : luaconf.h.template
++ rm -f $@ $@.tmp
++ $(edit) $< >$@.tmp
++ mv $@.tmp $@
diff --git a/flatpak/lua-5.3.0-idsize.patch b/flatpak/lua-5.3.0-idsize.patch
new file mode 100644
index 0000000..16107fe
--- /dev/null
+++ b/flatpak/lua-5.3.0-idsize.patch
@@ -0,0 +1,12 @@
+diff -up lua-5.3.0/src/luaconf.h.template.in.idsize lua-5.3.0/src/luaconf.h.template.in
+--- lua-5.3.0/src/luaconf.h.template.in.idsize 2015-01-15 10:23:20.515801344 -0500
++++ lua-5.3.0/src/luaconf.h.template.in 2015-01-15 10:23:48.955651916 -0500
+@@ -693,7 +693,7 @@
+ @@ of a function in debug information.
+ ** CHANGE it if you want a different size.
+ */
+-#define LUA_IDSIZE 60
++#define LUA_IDSIZE 512
+
+
+ /*
diff --git a/flatpak/org.gnome.Totem.json b/flatpak/org.gnome.Totem.json
new file mode 100644
index 0000000..f00991a
--- /dev/null
+++ b/flatpak/org.gnome.Totem.json
@@ -0,0 +1,250 @@
+{
+ "app-id": "org.gnome.Totem",
+ "runtime": "org.gnome.Platform",
+ "runtime-version": "3.22",
+ "branch": "stable",
+ "sdk": "org.gnome.Sdk",
+ "command": "totem",
+ "tags": [],
+ "finish-args": [
+ /* X11 + XShm access */
+ "--share=ipc", "--socket=x11",
+ /* Wayland access */
+ "--socket=wayland",
+ /* OpenGL access */
+ "--device=dri",
+ /* Needs to talk to the network: */
+ "--share=network",
+ /* Online accounts support */
+ "--talk-name=org.gnome.OnlineAccounts",
+ /* Tracker */
+ "--talk-name=org.freedesktop.Tracker1",
+ /* XXX This sucks */
+ "--filesystem=home",
+ /* Avahi */
+ "--system-talk-name=org.freedesktop.Avahi",
+ /* DLNA server */
+ "--talk-name=com.intel.dleyna-server",
+ /* Play sounds */
+ "--socket=pulseaudio",
+ /* Browse user's Videos directory */
+ "--filesystem=xdg-videos",
+ /* Browse gvfs */
+ "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
+ /* Needed for dconf to work */
+ "--filesystem=xdg-run/dconf", "--filesystem=~/.config/dconf:ro",
+ "--talk-name=ca.desrt.dconf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+ /* screensaver plugin */
+ "--talk-name=org.gnome.ScreenSaver",
+ /* screenshot plugin */
+ "--talk-name=org.gnome.Shell",
+ /* save-file plugin */
+ "--talk-name=org.gnome.Nautilus",
+ /* media-player-keys plugin */
+ "--talk-name=org.gnome.SettingsDaemon",
+ /* im-status plugin */
+ "--talk-name=org.gnome.SessionManager"
+ ],
+ "build-options" : {
+ "cflags": "-O2 -g",
+ "cxxflags": "-O2 -g"
+ },
+ "cleanup": [ "/include", "/share/bash-completion" ],
+ "modules": [
+ {
+ "name": "libpeas",
+ "cleanup": [ "/bin/*", "/lib/peas-demo" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/libpeas/1.20/libpeas-1.20.0.tar.xz";,
+ "sha256": "f392fffe2dc00072a51bb2a1b274224a06bdc5f9c3b3c0ac4816909e9933d354"
+ }
+ ]
+ },
+ {
+ "name": "gmime",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/gmime/2.6/gmime-2.6.20.tar.xz";,
+ "sha256": "e0a170fb264c2ae4cecd852f4e7aaddb8d58e8f3f0b569ce2d2a4704f55bdf65"
+ }
+ ],
+ "cleanup": [ "/include", "/share/vala" ]
+ },
+ {
+ "name": "totem-pl-parser",
+ "config-opts": [ "--disable-static" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/totem-pl-parser/3.10/totem-pl-parser-3.10.7.tar.xz";,
+ "sha256": "9c8285bc3131faa309d5cba5a919d5166abc2b8cc5a0c850fe861be8b14e089c"
+ }
+ ],
+ "cleanup": [ "/include" ]
+ },
+ {
+ "name": "grilo",
+ "config-opts": [ "--enable-grl-net", "--enable-grl-pls", "--disable-static" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/grilo/0.3/grilo-0.3.2.tar.xz";,
+ "sha256": "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b"
+ }
+ ],
+ "cleanup": [ "/include", "/bin" ]
+ },
+ {
+ "name": "librest",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/rest/0.8/rest-0.8.0.tar.xz";,
+ "sha256": "e7b89b200c1417073aef739e8a27ff2ab578056c27796ec74f5886a5e0dff647"
+ }
+ ]
+ },
+ {
+ "name": "gnome-online-accounts",
+ "config-opts": [ "--disable-telepathy", "--disable-documentation", "--disable-backend" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz";,
+ "sha256": "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33"
+ }
+ ]
+ },
+ {
+ "name": "liboauth",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://netix.dl.sourceforge.net/project/liboauth/liboauth-1.0.3.tar.gz";,
+ "sha256": "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
+ }
+ ]
+ },
+ {
+ "name": "libgdata",
+ "config-opts": [ "--disable-always-build-tests", "--disable-Werror", "--disable-static" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/libgdata/0.17/libgdata-0.17.6.tar.xz";,
+ "sha256": "8b6a3ff1db23bd9e5ebbcc958b29b769a898f892eed4798222d562ba69df30b0"
+ }
+ ]
+ },
+ {
+ "name": "gom",
+ "config-opts": [ "--disable-python" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/gom/0.3/gom-0.3.2.tar.xz";,
+ "sha256": "bce8f0f94af6ff7847b853580ba6baebbab8ae531cedb0c78a5c473f39c758fd"
+ }
+ ]
+ },
+ "org.lua.modules.json",
+ {
+ "name": "tracker",
+ "cleanup": [ "/bin", "/etc", "/libexec" ],
+ "config-opts": [ "--disable-miner-apps", "--disable-static",
+ "--disable-tracker-extract", "--disable-tracker-needle",
+ "--disable-tracker-preferences", "--disable-artwork",
+ "--disable-tracker-writeback", "--disable-miner-user-guides"],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/tracker/1.10/tracker-1.10.0.tar.xz";,
+ "sha256": "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb"
+ }
+ ]
+ },
+ {
+ "name": "libmediaart",
+ "cleanup": [ "/bin", "/etc", "/libexec" ],
+ "config-opts": [ "--disable-qt" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/libmediaart/1.9/libmediaart-1.9.0.tar.xz";,
+ "sha256": "94668adb29d4dc3115b0fd105942ebd5ca6f5f9dbb2afa8a191a73a747dd506f"
+ }
+ ]
+ },
+ {
+ "name": "avahi",
+ "cleanup": [ "/bin" ],
+ "config-opts": [
+ "--with-distro=none",
+ "--enable-gobject",
+ "--with-xml=expat",
+ "--disable-libdaemon",
+ "--disable-core-docs",
+ "--disable-manpages",
+ "--disable-mono",
+ "--disable-qt3",
+ "--disable-qt4",
+ "--disable-python",
+ "--disable-gtk",
+ "--disable-gtk3"
+ ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://avahi.org/download/avahi-0.6.31.tar.gz";,
+ "sha256": "8372719b24e2dd75de6f59bb1315e600db4fd092805bd1201ed0cb651a2dab48"
+ },
+ {
+ "type": "shell",
+ "commands": [
+ "cp -f /usr/share/gnu-config/config.sub .",
+ "cp -f /usr/share/gnu-config/config.guess ."
+ ]
+ }
+ ]
+ },
+ /* XXX Remove the Lua sources we won't use */
+ {
+ "name": "grilo-plugins",
+ "config-opts": [ "--enable-goa", "--enable-filesystem", "--enable-optical-media",
"--enable-youtube", "--enable-bookmarks", "--enable-lua-factory", "--enable-metadata-store",
"--enable-vimeo", "--enable-tracker", "--enable-localmetadata", "--enable-dleyna", "--enable-thetvdb",
"--enable-tmdb", "--enable-freebox", "--enable-opensubtitles" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/grilo-plugins/0.3/grilo-plugins-0.3.3.tar.xz";,
+ "sha256": "fe66e887847fef9c361bcb7226047c43b2bc22b172aaf22afd5534947cc85b9c"
+ }
+ ],
+ "cleanup": [ "/include" ]
+ },
+ {
+ "name": "gnome-desktop",
+ "config-opts": ["--disable-debug-tools", "--disable-udev"],
+ "sources": [
+ {
+ "type": "archive",
+ "url":
"https://download.gnome.org/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz";,
+ "sha256": "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d"
+ }
+ ]
+ },
+ {
+ "name": "totem",
+ "config-opts": [ "--disable-static" ],
+ "sources": [
+ {
+ "type": "archive",
+ "url": "https://download.gnome.org/sources/totem/3.22/totem-3.22.0.tar.xz";,
+ "sha256": "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea"
+ }
+ ],
+ "cleanup": [ "/bin/totem-audio-preview" ]
+ }
+ ]
+}
diff --git a/flatpak/org.lua.modules.json b/flatpak/org.lua.modules.json
new file mode 100644
index 0000000..161e4ef
--- /dev/null
+++ b/flatpak/org.lua.modules.json
@@ -0,0 +1,28 @@
+{
+ "name": "lua",
+ "sources": [
+ {
+ "type": "archive",
+ "url": "http://www.lua.org/ftp/lua-5.3.2.tar.gz";,
+ "sha256": "c740c7bb23a936944e1cc63b7c3c5351a8976d7867c5252c8854f7b2af9da68f"
+ },
+ {
+ "type": "shell",
+ "commands": [ "mv src/luaconf.h src/luaconf.h.template.in" ]
+ },
+ /* Patches from the Fedora package */
+ {
+ "type": "patch",
+ "path": "lua-5.3.0-autotoolize.patch"
+ },
+ {
+ "type": "patch",
+ "path": "lua-5.3.0-idsize.patch"
+ },
+ {
+ "type": "shell",
+ "commands": [ "autoreconf -i" ]
+ }
+ ],
+ "cleanup": [ "/bin" ]
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
