...
 
Commits (9)
Overview of changes in 3.30.2
=============================
* Delayed loading of remote cover art
* Fix keyboard shortcuts
* Flatpak fixes
Bugs fixed:
flatpak: Grilo lua plugin support is disabled (#226)
Almost none of the keyboard shortcuts work (#238)
Thanks to our contributors this release:
Christophe van den Abbeele
Jean Felder
Marinus Schraal
Translations updated:
Serbian
Overview of changes in 3.30.1
=============================
......
......@@ -33,6 +33,7 @@ Billy Barrow
Bruce Cowan
Carlos Garnacho
Carlos Soriano
Christophe van den Abbeele
Clayton G. Hobbs
Divyanshu Vishwakarma
Eslam Mostafa
......
......@@ -246,6 +246,7 @@ class Art(GObject.GObject):
remote_art = RemoteArt()
remote_art.connect('retrieved', self._remote_art_retrieved)
remote_art.connect('unavailable', self._remote_art_unavailable)
remote_art.connect('no-remote-sources', self._remote_art_no_sources)
remote_art.query(self._media)
@log
......@@ -260,6 +261,10 @@ class Art(GObject.GObject):
self._add_to_blacklist()
self._no_art_available()
@log
def _remote_art_no_sources(self, klass):
self._no_art_available()
@log
def _no_art_available(self):
self._surface = DefaultIcon().get(
......@@ -610,7 +615,8 @@ class RemoteArt(GObject.GObject):
__gsignals__ = {
'retrieved': (GObject.SignalFlags.RUN_FIRST, None, ()),
'unavailable': (GObject.SignalFlags.RUN_FIRST, None, ())
'unavailable': (GObject.SignalFlags.RUN_FIRST, None, ()),
'no-remote-sources': (GObject.SignalFlags.RUN_FIRST, None, ())
}
def __repr__(self):
......@@ -631,10 +637,20 @@ class RemoteArt(GObject.GObject):
"""
self._album = utils.get_album_title(media)
self._artist = utils.get_artist_name(media)
self._media = media
# FIXME: It seems this Grilo query does not always return,
# especially on queries with little info.
grilo.get_album_art_for_item(media, self._remote_album_art)
if not grilo.props.cover_sources:
self.emit('no-remote-sources')
grilo.connect(
'notify::cover-sources', self._on_grilo_cover_sources_changed)
else:
# FIXME: It seems this Grilo query does not always return,
# especially on queries with little info.
grilo.get_album_art_for_item(media, self._remote_album_art)
def _on_grilo_cover_sources_changed(self, klass, data):
if grilo.props.cover_sources:
grilo.get_album_art_for_item(self._media, self._remote_album_art)
@log
def _delete_callback(self, src, result, data):
......
......@@ -80,6 +80,7 @@ class Grilo(GObject.GObject):
_theaudiodb_api_key = "195003"
sources = GObject.Property()
cover_sources = GObject.Property(type=bool, default=False)
def __repr__(self):
return '<Grilo>'
......@@ -117,6 +118,9 @@ class Grilo(GObject.GObject):
self.changes_pending = {'Albums': False, 'Artists': False, 'Songs': False}
self.pending_changed_medias = []
self._thumbnail_sources = []
self._thumbnail_sources_timeout = None
self.registry = Grl.Registry.get_default()
self.sparqltracker = TrackerWrapper().tracker
......@@ -201,6 +205,14 @@ class Grilo(GObject.GObject):
self.emit('changes-pending')
return False
@log
def _trigger_art_update(self):
self._thumbnail_sources_timeout = None
if len(self._thumbnail_sources) > 0:
self.props.cover_sources = True
return GLib.SOURCE_REMOVE
@log
def _on_source_added(self, pluginRegistry, mediaSource):
if ("net:plaintext" in mediaSource.get_tags()
......@@ -212,6 +224,14 @@ class Grilo(GObject.GObject):
"Failed to unregister {}".format(mediaSource.get_id()))
return
if Grl.METADATA_KEY_THUMBNAIL in mediaSource.supported_keys():
self._thumbnail_sources.append(mediaSource)
if not self._thumbnail_sources_timeout:
# Aggregate sources being added, for example when the
# network comes online.
self._thumbnail_sources_timeout = GLib.timeout_add_seconds(
5, self._trigger_art_update)
id = mediaSource.get_id()
logger.debug("new grilo source %s was added", id)
try:
......
......@@ -22,7 +22,7 @@
# code, but you are not obligated to do so. If you do not wish to do so,
# delete this exception statement from your version.
from gi.repository import GObject, Gtk
from gi.repository import GLib, GObject, Gtk
from gnomemusic import log
from gnomemusic.albumartcache import Art, DefaultIcon
......@@ -55,8 +55,10 @@ class CoverStack(Gtk.Stack):
"""
super().__init__()
self._size = None
self._art = None
self._handler_id = None
self._size = None
self._timeout = None
self._loading_cover = Gtk.Image()
self._cover_a = Gtk.Image()
......@@ -100,15 +102,34 @@ class CoverStack(Gtk.Stack):
Update the stack with the art retrieved from the given media.
:param Grl.Media media: The media object
"""
if self._handler_id and self._art:
# Remove a possible dangling 'finished' callback if update
# is called again, but it is still looking for the previous
# art.
self._art.disconnect(self._handler_id)
# Set the loading state only after a delay to make between
# song transitions smooth if loading time is negligible.
self._timeout = GLib.timeout_add(100, self._set_loading_child)
self._active_child = self.props.visible_child_name
art = Art(self.props.size, media, self.props.scale_factor)
self._handler_id = art.connect('finished', self._art_retrieved)
art.lookup()
self._art = Art(self.props.size, media, self.props.scale_factor)
self._handler_id = self._art.connect('finished', self._art_retrieved)
self._art.lookup()
@log
def _set_loading_child(self):
self.props.visible_child_name = "loading"
self._active_child = self.props.visible_child_name
return GLib.SOURCE_REMOVE
@log
def _art_retrieved(self, klass):
klass.disconnect(self._handler_id)
if self._timeout:
GLib.source_remove(self._timeout)
self._timeout = None
if self._active_child == "B":
self._cover_a.props.surface = klass.surface
self.props.visible_child_name = "A"
......@@ -116,4 +137,7 @@ class CoverStack(Gtk.Stack):
self._cover_b.props.surface = klass.surface
self.props.visible_child_name = "B"
self._active_child = self.props.visible_child_name
self._art = None
self.emit('updated')
......@@ -291,7 +291,7 @@ class Window(Gtk.ApplicationWindow):
@log
def _on_key_press(self, widget, event):
modifiers = event.get_state()
modifiers = event.get_state() & Gtk.accelerator_get_default_mod_mask()
(_, keyval) = event.get_keyval()
control_mask = Gdk.ModifierType.CONTROL_MASK
......
project('gnome-music',
version: '3.30.1',
version: '3.30.2',
meson_version: '>= 0.46.0'
)
......
{
"app-id": "org.gnome.Music",
"runtime": "org.gnome.Platform",
"runtime-version": "master",
"runtime-version": "3.30",
"sdk": "org.gnome.Sdk",
"command": "gnome-music",
"tags": ["stable", "3.30"],
......@@ -17,6 +17,7 @@
"--own-name=org.mpris.MediaPlayer2.GnomeMusic",
"--talk-name=org.gnome.SettingsDaemon.MediaKeys",
"--talk-name=com.intel.dleyna-server",
"--talk-name=org.gtk.vfs.mountpoint_http",
"--socket=pulseaudio",
"--filesystem=xdg-music",
"--filesystem=xdg-cache/media-art"
......@@ -41,6 +42,7 @@
"*.a"
],
"modules": [
"subprojects/shared-modules/lua5.3/lua-5.3.2.json",
{
"name": "libmediaart",
"sources": [
......@@ -59,7 +61,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libdazzle.git"
"url": "https://gitlab.gnome.org/GNOME/libdazzle.git",
"branch": "libdazzle-3-30"
}
]
},
......@@ -119,13 +122,12 @@
"name": "grilo-plugins",
"buildsystem": "meson",
"config-opts": [ "-Denable-dleyna=yes",
"-Denable-goa=yes",
"-Denable-tracker=yes",
"-Denable-bookmarks=no",
"-Denable-filesystem=no",
"-Denable-freebox=no",
"-Denable-localmetadata=no",
"-Denable-lua-factory=no",
"-Denable-local-metadata=no",
"-Denable-lua-factory=yes",
"-Denable-metadata-store=no",
"-Denable-opensubtitles=no",
"-Denable-optical-media=no",
......@@ -148,7 +150,8 @@
"sources": [
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/gnome-music.git"
"url": "https://gitlab.gnome.org/GNOME/gnome-music.git",
"branch": "gnome-3-30"
}
]
}
......
This diff is collapsed.
This repository contains commonly shared modules and is intended to be used as a git submodule.
To use shared modules for packaging an application, add the submodule:
```
git submodule add https://github.com/flathub/shared-modules.git
```
Then modules from this repository can be specified in a manifest JSON file like this:
```json
"modules": [
"shared-modules/SDL/SDL-1.2.15.json",
{
"name": "foo"
}
]
```
[See the description in the Flathub wiki](https://github.com/flathub/flathub/wiki/App-Requirements#shared-modules) for more information.
Please do not request adding modules unless they have many users in the Flathub repository.
{
"name": "SDL1",
"rm-configure": true,
"config-opts": ["--disable-static"],
"cleanup": [
"/bin",
"/share/man",
"/share/aclocal",
"/include",
"/lib/pkgconfig",
"/lib/*.la",
"/lib/*.a"
],
"sources": [
{
"type": "archive",
"url": "https://www.libsdl.org/release/SDL-1.2.15.tar.gz",
"sha256": "d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
},
{
"type": "patch",
"path": "sdl-libx11-build.patch"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"sed -i -e 's/.*AM_PATH_ESD.*//' configure.in",
"cp -p /usr/share/automake-*/config.{sub,guess} build-scripts",
"aclocal",
"libtoolize",
"autoconf"
]
}
]
}
diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.c SDL_Pango-0.1.2/src/SDL_Pango.c
--- SDL_Pango-0.1.2.orig/src/SDL_Pango.c 2004-12-10 10:06:33.000000000 +0100
+++ SDL_Pango-0.1.2/src/SDL_Pango.c 2006-09-29 17:42:09.000000000 +0200
@@ -723,13 +723,8 @@ SDLPango_CopyFTBitmapToSurface(
SDL_UnlockSurface(surface);
}
-/*!
- Create a context which contains Pango objects.
-
- @return A pointer to the context as a SDLPango_Context*.
-*/
SDLPango_Context*
-SDLPango_CreateContext()
+SDLPango_CreateContext_GivenFontDesc(const char* font_desc)
{
SDLPango_Context *context = g_malloc(sizeof(SDLPango_Context));
G_CONST_RETURN char *charset;
@@ -743,8 +738,7 @@ SDLPango_CreateContext()
pango_context_set_language (context->context, pango_language_from_string (charset));
pango_context_set_base_dir (context->context, PANGO_DIRECTION_LTR);
- context->font_desc = pango_font_description_from_string(
- MAKE_FONT_NAME (DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
+ context->font_desc = pango_font_description_from_string(font_desc);
context->layout = pango_layout_new (context->context);
@@ -762,6 +756,17 @@ SDLPango_CreateContext()
}
/*!
+ Create a context which contains Pango objects.
+
+ @return A pointer to the context as a SDLPango_Context*.
+*/
+SDLPango_Context*
+SDLPango_CreateContext()
+{
+ SDLPango_CreateContext_GivenFontDesc(MAKE_FONT_NAME(DEFAULT_FONT_FAMILY, DEFAULT_FONT_SIZE));
+}
+
+/*!
Free a context.
@param *context [i/o] Context to be free
@@ -1053,6 +1058,20 @@ SDLPango_SetMarkup(
pango_layout_set_font_description (context->layout, context->font_desc);
}
+void
+SDLPango_SetText_GivenAlignment(
+ SDLPango_Context *context,
+ const char *text,
+ int length,
+ SDLPango_Alignment alignment)
+{
+ pango_layout_set_attributes(context->layout, NULL);
+ pango_layout_set_text (context->layout, text, length);
+ pango_layout_set_auto_dir (context->layout, TRUE);
+ pango_layout_set_alignment (context->layout, alignment);
+ pango_layout_set_font_description (context->layout, context->font_desc);
+}
+
/*!
Set plain text to context.
Text must be utf-8.
@@ -1067,11 +1086,7 @@ SDLPango_SetText(
const char *text,
int length)
{
- pango_layout_set_attributes(context->layout, NULL);
- pango_layout_set_text (context->layout, text, length);
- pango_layout_set_auto_dir (context->layout, TRUE);
- pango_layout_set_alignment (context->layout, PANGO_ALIGN_LEFT);
- pango_layout_set_font_description (context->layout, context->font_desc);
+ SDLPango_SetText_GivenAlignment(context, text, length, SDLPANGO_ALIGN_LEFT);
}
/*!
diff -Naupr SDL_Pango-0.1.2.orig/src/SDL_Pango.h SDL_Pango-0.1.2/src/SDL_Pango.h
--- SDL_Pango-0.1.2.orig/src/SDL_Pango.h 2004-12-10 10:06:33.000000000 +0100
+++ SDL_Pango-0.1.2/src/SDL_Pango.h 2006-09-29 17:42:09.000000000 +0200
@@ -109,12 +109,20 @@ typedef enum {
SDLPANGO_DIRECTION_NEUTRAL /*! Neutral */
} SDLPango_Direction;
-
+/*!
+ Specifies alignment of text. See Pango reference for detail
+*/
+typedef enum {
+ SDLPANGO_ALIGN_LEFT,
+ SDLPANGO_ALIGN_CENTER,
+ SDLPANGO_ALIGN_RIGHT
+} SDLPango_Alignment;
extern DECLSPEC int SDLCALL SDLPango_Init();
extern DECLSPEC int SDLCALL SDLPango_WasInit();
+extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext_GivenFontDesc(const char* font_desc);
extern DECLSPEC SDLPango_Context* SDLCALL SDLPango_CreateContext();
extern DECLSPEC void SDLCALL SDLPango_FreeContext(
@@ -157,6 +165,12 @@ extern DECLSPEC void SDLCALL SDLPango_Se
const char *markup,
int length);
+extern DECLSPEC void SDLCALL SDLPango_SetText_GivenAlignment(
+ SDLPango_Context *context,
+ const char *text,
+ int length,
+ SDLPango_Alignment alignment);
+
extern DECLSPEC void SDLCALL SDLPango_SetText(
SDLPango_Context *context,
const char *markup,
{
"name": "SDL_image",
"config-opts": ["--disable-static"],
"rm-configure": true,
"sources": [
{
"type": "archive",
"url": "https://www.libsdl.org/projects/SDL_image/release/SDL_image-1.2.12.tar.gz",
"sha256": "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
]
}
]
}
{
"name": "SDL_mixer",
"config-opts": ["--disable-static"],
"rm-configure": true,
"sources": [
{
"type": "archive",
"url": "https://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.12.tar.gz",
"sha256": "1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"rm acinclude/libtool.m4",
"rm acinclude/lt*",
"AUTOMAKE=\"automake --foreign\" autoreconf -vfi -I acinclude",
"cp -p /usr/share/automake-*/config.{sub,guess} build-scripts"
]
}
]
}
{
"name": "SDL_net",
"config-opts": ["--disable-static"],
"rm-configure": true,
"sources": [
{
"type": "archive",
"url": "https://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.8.tar.gz",
"sha256": "5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
]
}
]
}
{
"name": "SDL_pango",
"config-opts": ["--disable-static"],
"rm-configure": true,
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/project/sdlpango/SDL_Pango/0.1.2/SDL_Pango-0.1.2.tar.gz",
"sha256": "7f75d3b97acf707c696ea126424906204ebfa07660162de925173cdd0257eba4"
},
{
"type": "patch",
"path": "SDL_Pango-0.1.2-API-adds.patch"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"autoreconf -vfi"
]
}
]
}
{
"name": "SDL_ttf",
"config-opts": ["--disable-static"],
"rm-configure": true,
"sources": [
{
"type": "archive",
"url": "https://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz",
"sha256": "724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"AUTOMAKE=\"automake --foreign\" autoreconf -vfi"
]
}
]
}
# HG changeset patch
# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
# Date 1370184533 -21600
# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8
# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268
Fix compilation with libX11 >= 1.5.99.902.
These changes fixes bug #1769 for SDL 1.2
(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in
--- a/configure.in Wed Apr 17 00:56:53 2013 -0700
+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600
@@ -1169,6 +1169,17 @@
if test x$definitely_enable_video_x11_xrandr = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR)
fi
+ AC_MSG_CHECKING(for const parameter to _XData32)
+ have_const_param_xdata32=no
+ AC_TRY_COMPILE([
+ #include <X11/Xlibint.h>
+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+ ],[
+ ],[
+ have_const_param_xdata32=yes
+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
+ ])
+ AC_MSG_RESULT($have_const_param_xdata32)
fi
fi
}
diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in
--- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700
+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600
@@ -283,6 +283,7 @@
#undef SDL_VIDEO_DRIVER_WINDIB
#undef SDL_VIDEO_DRIVER_WSCONS
#undef SDL_VIDEO_DRIVER_X11
+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
#undef SDL_VIDEO_DRIVER_X11_DGAMOUSE
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT
diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h
--- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700
+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600
@@ -165,7 +165,11 @@
*/
#ifdef LONG64
SDL_X11_MODULE(IO_32BIT)
+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+#else
SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+#endif
SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
#endif
cmake_minimum_required(VERSION 2.8)
project (cld2)
enable_language(CXX)
set (VERSION "0.0.197")
set (common_SOURCE_FILES
internal/cldutil.cc
internal/cldutil_shared.cc
internal/compact_lang_det.cc
internal/compact_lang_det_hint_code.cc
internal/compact_lang_det_impl.cc
internal/debug.cc
internal/fixunicodevalue.cc
internal/generated_entities.cc
internal/generated_language.cc
internal/generated_ulscript.cc
internal/getonescriptspan.cc
internal/lang_script.cc
internal/offsetmap.cc
internal/scoreonescriptspan.cc
internal/tote.cc
internal/utf8statetable.cc
)
set (cld2_SOURCE_FILES
internal/generated_distinct_bi_0.cc
internal/cld_generated_cjk_uni_prop_80.cc
internal/cld2_generated_cjk_compatible.cc
internal/cld_generated_cjk_delta_bi_4.cc
internal/cld2_generated_quadchrome_2.cc
internal/cld2_generated_deltaoctachrome.cc
internal/cld2_generated_distinctoctachrome.cc
internal/cld_generated_score_quad_octa_2.cc
)
set (cld2_full_SOURCE_FILES
internal/generated_distinct_bi_0.cc
internal/cld_generated_cjk_uni_prop_80.cc
internal/cld2_generated_cjk_compatible.cc
internal/cld_generated_cjk_delta_bi_32.cc
internal/cld2_generated_quad0122.cc
internal/cld2_generated_deltaocta0122.cc
internal/cld2_generated_distinctocta0122.cc
internal/cld_generated_score_quad_octa_0122.cc
)
set (cld2_dynamic_SOURCE_FILES
internal/cld2_dynamic_data.cc
internal/cld2_dynamic_data_loader.cc
)
add_library(cld2 SHARED ${common_SOURCE_FILES} ${cld2_SOURCE_FILES})
set_target_properties(cld2 PROPERTIES
ENABLE_EXPORTS On
OUTPUT_NAME cld2
VERSION ${VERSION}
SOVERSION 0
)
add_library(cld2_full SHARED ${cld2_full_SOURCE_FILES})
set_target_properties(cld2_full PROPERTIES
ENABLE_EXPORTS On
OUTPUT_NAME cld2_full
VERSION ${VERSION}
SOVERSION 0
)
add_library(cld2_dynamic SHARED ${cld2_dynamic_SOURCE_FILES})
set_target_properties(cld2_dynamic PROPERTIES
ENABLE_EXPORTS On
OUTPUT_NAME cld2_dynamic
VERSION ${VERSION}
SOVERSION 0
COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE"
)
install(TARGETS cld2 DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
install(TARGETS cld2_full DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
install(TARGETS cld2_dynamic DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE})
set (cld2_internal_HEADERS
internal/cld2_dynamic_compat.h
internal/cld2_dynamic_data_extractor.h
internal/cld2_dynamic_data.h
internal/cld2_dynamic_data_loader.h
internal/cld2tablesummary.h
internal/cldutil.h
internal/cldutil_offline.h
internal/cldutil_shared.h
internal/compact_lang_det_hint_code.h
internal/compact_lang_det_impl.h
internal/debug.h
internal/fixunicodevalue.h
internal/generated_language.h
internal/generated_ulscript.h
internal/getonescriptspan.h
internal/integral_types.h
internal/lang_script.h
internal/langspan.h
internal/offsetmap.h
internal/port.h
internal/scoreonescriptspan.h
internal/stringpiece.h
internal/tote.h
internal/unittest_data.h
internal/utf8acceptinterchange.h
internal/utf8prop_lettermarkscriptnum.h
internal/utf8repl_lettermarklower.h
internal/utf8scannot_lettermarkspecial.h
internal/utf8statetable.h
)
install(FILES ${cld2_internal_HEADERS} DESTINATION include/cld2/internal)
set (cld2_public_HEADERS
public/compact_lang_det.h
public/encodings.h
)
install(FILES ${cld2_public_HEADERS} DESTINATION include/cld2/public)
set (full_SOURCE_FILES
internal/cld_generated_cjk_uni_prop_80.cc
internal/cld2_generated_cjk_compatible.cc
internal/cld_generated_cjk_delta_bi_32.cc
internal/generated_distinct_bi_0.cc
internal/cld2_generated_quad0122.cc
internal/cld2_generated_deltaocta0122.cc
internal/cld2_generated_distinctocta0122.cc
internal/cld_generated_score_quad_octa_0122.cc
)
add_executable(compact_lang_det_test_full ${full_SOURCE_FILES} internal/compact_lang_det_test.cc)
add_executable(cld2_unittest_full ${full_SOURCE_FILES} internal/cld2_unittest_full.cc)
add_executable(cld2_unittest_full_avoid ${full_SOURCE_FILES} internal/cld2_unittest_full.cc)
set_target_properties(cld2_unittest_full_avoid PROPERTIES COMPILE_FLAGS "-Davoid_utf8_string_constants")
add_executable(cld2_dynamic_data_tool internal/cld2_dynamic_data_extractor.cc internal/cld2_dynamic_data_tool.cc)
add_executable(compact_lang_det_dynamic_test_chrome ${common_SOURCE_FILES} internal/cld2_dynamic_data_extractor.cc internal/compact_lang_det_test.cc)
add_executable(cld2_dynamic_unittest ${common_SOURCE_FILES} internal/cld2_unittest.cc)
set_target_properties(compact_lang_det_dynamic_test_chrome PROPERTIES COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE")
set_target_properties(cld2_dynamic_unittest PROPERTIES COMPILE_FLAGS "-DCLD2_DYNAMIC_MODE")
add_executable(compact_lang_det_test_chrome_2 internal/compact_lang_det_test.cc)
add_executable(compact_lang_det_test_chrome_16 internal/compact_lang_det_test.cc)
add_executable(cld2_unittest_chrome_2 internal/cld2_unittest.cc)
add_executable(cld2_unittest_avoid_chrome_2 internal/cld2_unittest.cc)
set_target_properties(cld2_unittest_avoid_chrome_2 PROPERTIES COMPILE_FLAGS "-Davoid_utf8_string_constants")
target_link_libraries(compact_lang_det_test_full cld2)
target_link_libraries(cld2_unittest_full cld2)
target_link_libraries(cld2_unittest_full_avoid cld2)
target_link_libraries(cld2_dynamic_data_tool cld2 cld2_dynamic)
target_link_libraries(compact_lang_det_dynamic_test_chrome cld2_dynamic)
target_link_libraries(cld2_dynamic_unittest cld2_dynamic)
target_link_libraries(compact_lang_det_test_chrome_2 cld2)
target_link_libraries(compact_lang_det_test_chrome_16 cld2)
target_link_libraries(cld2_unittest_chrome_2 cld2)
target_link_libraries(cld2_unittest_avoid_chrome_2 cld2)
{
"name": "cld2",
"buildsystem": "simple",
"build-options": {
"cxxflags": "-std=c++98"
},
"build-commands": [
"cp CMakeLists.txt ./cld2",
"cd cld2 && mkdir build && cd build && cmake .. -DCMAKE_INSTALL_PREFIX=/app -DCMAKE_BUILD_TYPE=Release",
"cd cld2/build && make && make install"
],
"sources":[
{
"type": "git",
"url": "https://github.com/CLD2Owners/cld2.git",
"commit": "84b58a5d7690ebf05a91406f371ce00c3daf31c0",
"dest": "cld2"
},
{
"type": "file",
"path": "CMakeLists.txt"
}
]
}
{
"name": "glew",
"no-autogen": true,
"make-args": [
"GLEW_PREFIX=/app",
"GLEW_DEST=/app",
"LIBDIR=/app/lib"
],
"make-install-args": [
"GLEW_PREFIX=/app",
"GLEW_DEST=/app",
"LIBDIR=/app/lib"
],
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/project/glew/glew/2.1.0/glew-2.1.0.tgz",
"sha256": "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95"
}
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/lib/*.a"
]
}
{
"name": "glu",
"sources": [
{
"type": "archive",
"url": "https://mesa.freedesktop.org/archive/glu/glu-9.0.0.tar.bz2",
"sha256": "1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12"
}
],
"cleanup": [ "/include", "/lib/*.a", "/lib/*.la", "/lib/pkgconfig" ]
}
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index 186a8f5cb2..f5c39b5afe 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -3000,6 +3000,50 @@ check_transform (const gchar *xsettings_name,
return TRUE;
}
+static gchar *
+gtk_rc_get_theme_dir (void)
+{
+ const gchar *var;
+ gchar *path;
+
+ var = g_getenv ("GTK_DATA_PREFIX");
+
+ if (var)
+ path = g_build_filename (var, "share", "themes", NULL);
+ else
+ path = g_build_filename ("/usr", "share", "themes", NULL);
+
+ return path;
+}
+
+static gboolean
+theme_name_valid (XSettingsSetting *setting)
+{
+ gboolean res = FALSE;
+
+ if (setting->type == XSETTINGS_TYPE_STRING)
+ {
+ char *theme_name = setting->data.v_string;
+ gchar *theme_dir = gtk_rc_get_theme_dir ();
+ gchar *path = g_build_filename (theme_dir, theme_name, "gtk-2.0", "gtkrc", NULL);
+
+ if (g_file_test (path, G_FILE_TEST_EXISTS))
+ res = TRUE;
+ else if (g_str_has_suffix (theme_name, "-Dark") ||
+ g_str_has_suffix (theme_name, "-dark"))
+ {
+ setting->data.v_string = g_strdup ("Adwaita-dark");
+ g_free (theme_name);
+ res = TRUE;
+ }
+
+ g_free (theme_dir);
+ g_free (path);
+ }
+
+ return res;
+}
+
/**
* gdk_screen_get_setting:
* @screen: the #GdkScreen where the setting is located
@@ -3050,6 +3094,11 @@ gdk_screen_get_setting (GdkScreen *screen,
if (result != XSETTINGS_SUCCESS)
goto out;
+ if (strcmp (name, "gtk-theme-name") == 0 &&
+ (setting->type != XSETTINGS_TYPE_STRING ||
+ !theme_name_valid (setting)))
+ goto out;
+
switch (setting->type)
{
case XSETTINGS_TYPE_INT:
diff --git a/gtk/gtksettings.c b/gtk/gtksettings.c
index 3fbbf00548..5c0a4b33d2 100644
--- a/gtk/gtksettings.c
+++ b/gtk/gtksettings.c
@@ -312,7 +312,7 @@ gtk_settings_class_init (GtkSettingsClass *class)
#ifdef G_OS_WIN32
"MS-Windows",
#else
- "Raleigh",
+ "Adwaita",
#endif
GTK_PARAM_READWRITE),
NULL);
{
"name": "gnome-themes-extra",
"rm-configure": true,
"config-opts": [
"--disable-dependency-tracking",
"--disable-gtk3-engine"
],
"cleanup": [
"/share/themes/Adwaita/gtk-3.0",
"/share/themes/Adwaita-dark/gtk-3.0",
"/share/themes/HighContrast/gtk-3.0",
"*.la"
],
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/gnome-themes-extra/3.28/gnome-themes-extra-3.28.tar.xz",
"sha256": "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819"
},
{
"type": "shell",
"//": "We want to avoid generating icons as its 99% of the build time and gnome runtime has it",
"commands": [
"sed -i 's/icons//' themes/HighContrast/Makefile.am"
]
},
{
"type": "script",
"commands": [
"autoreconf -fsi"
]
}
],
"modules": [
{
"name": "gtk2",
"cleanup": [
"/bin",
"/share/gtk-2.0",
"/share/aclocal",
"/share/gtk-doc",
"/lib/pkgconfig",
"/lib/gtk-2.0/include",
"/include",
"*.la"
],
"x-cpe": {
"product": "gtk+"
},
"config-opts": [
"--disable-dependency-tracking",
"--disable-gtk-doc-html",
"--disable-introspection",
"--with-xinput=xfree"
],
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/gtk+/2.24/gtk+-2.24.32.tar.xz",
"sha256": "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"
},
{
"type": "patch",
"path": "gtk2-use-adwaita-theme.patch"
}
]
}
]
}
\ No newline at end of file
{
"name": "lame",
"rm-configure": true,
"config-opts": ["--disable-static"],
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/lame/lame-3.99.5.tar.gz",
"sha256": "24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff"
},
{
"type": "patch",
"path": "lame-msse.patch"
},
{
"type": "patch",
"path": "lame-gtk1-ac-directives.patch"
},
{
"type": "patch",
"path": "lame-ansi2knr2devnull.patch"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"autoreconf -vfi"
]
}
],
"cleanup": ["/bin", "/include", "/share/doc", "/share/man", "*.la"]
}
Description: Patch out remaining ansi2knr.
Author: Dimitri John Ledkov <xnox@ubuntu.com>
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=755111
--- a/configure.in
+++ b/configure.in
@@ -78,7 +78,6 @@
fi
dnl more automake stuff
-AM_C_PROTOTYPES
AC_CHECK_HEADER(dmalloc.h)
if test "${ac_cv_header_dmalloc_h}" = "yes"; then
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@@ -1,6 +1,6 @@
## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $
-AUTOMAKE_OPTIONS = foreign ansi2knr
+AUTOMAKE_OPTIONS = foreign
man_MANS = lame.1
EXTRA_DIST = ${man_MANS}
--- a/libmp3lame/i386/Makefile.am
+++ b/libmp3lame/i386/Makefile.am
@@ -1,6 +1,6 @@
## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $
-AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr
+AUTOMAKE_OPTIONS = foreign
DEFS = @DEFS@ @CONFIG_DEFS@
--- a/doc/html/Makefile.am
+++ b/doc/html/Makefile.am
@@ -1,6 +1,6 @@
## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $
-AUTOMAKE_OPTIONS = foreign ansi2knr
+AUTOMAKE_OPTIONS = foreign
docdir = $(datadir)/doc
pkgdocdir = $(docdir)/$(PACKAGE)
Description: Include GTK-1 autoconf directives in build system.
Origin: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/lame.git;a=tree;f=debian/patches
Forwarded: yes
Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?revision=1.6
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -85,4 +85,197 @@
[AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)]
)])]) # alex_IEEE854_FLOAT80
+# Configure paths for GTK+
+# Owen Taylor 97-11-3
+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+dnl
+AC_DEFUN([AM_PATH_GTK],
+[dnl
+dnl Get the cflags and libraries from the gtk-config script
+dnl
+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
+ gtk_config_prefix="$withval", gtk_config_prefix="")
+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
+ , enable_gtktest=yes)
+
+ for module in . $4
+ do
+ case "$module" in
+ gthread)
+ gtk_config_args="$gtk_config_args gthread"
+ ;;
+ esac
+ done
+
+ if test x$gtk_config_exec_prefix != x ; then
+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+ fi
+ fi
+ if test x$gtk_config_prefix != x ; then
+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+ if test x${GTK_CONFIG+set} != xset ; then
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+ fi
+ fi
+
+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no)
+ min_gtk_version=ifelse([$1], ,0.99.7,$1)
+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version)
+ no_gtk=""
+ if test "$GTK_CONFIG" = "no" ; then
+ no_gtk=yes
+ else
+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK is sufficiently new. (Also sanity
+dnl checks the results of gtk-config to some extent
+dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gtktest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
+ exit(1);
+ }
+
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf ("*** was found! If gtk-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
+ printf("*** before re-running configure\n");
+ }
+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+#endif /* defined (GTK_MAJOR_VERSION) ... */
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+ AC_MSG_RESULT(yes)
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$GTK_CONFIG" = "no" ; then
+ echo "*** The gtk-config script installed by GTK could not be found"
+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in"
+ echo "*** your path, or set the GTK_CONFIG environment variable to the"
+ echo "*** full path to gtk-config."
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK test program, checking why..."
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ echo "***"
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+ echo "*** came with the system with the command"
+ echo "***"
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GTK_CFLAGS=""
+ GTK_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ rm -f conf.gtktest
+])
Description: Build xmm_quantize_sub.c with -msse
Author: Sebastian Ramacher <sramacher@debian.org>
Bug: http://sourceforge.net/p/lame/bugs/443/
Bug-Debian: https://bugs.debian.org/760047
Forwarded: http://sourceforge.net/p/lame/bugs/443/
Last-Update: 2014-08-31
--- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am
+++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am
@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c
if WITH_XMM
liblamevectorroutines_la_SOURCES = $(xmm_sources)
+liblamevectorroutines_la_CFLAGS = -msse
endif
noinst_HEADERS = lame_intrin.h
From: Olivier Tilloy <olivier.tilloy@canonical.com>
Date: Tue 2018-03-20 12:47:56 +0000
Subject: [PATCH] libappindicator FTBFS on bionic
Fix build failures on bionic,
and update Vcs-* fields in debian/control. (LP: #1757121)
Approved by: Marco Trevisan (Treviño)
---
--- libappindicator-12.10.0/src/app-indicator.c 2017-02-15 14:10:41 +0000
+++ libappindicator-12.10.0/src/app-indicator.c 2018-03-20 12:38:59 +0000
@@ -2196,7 +2196,7 @@ app_indicator_set_secondary_activate_tar
g_return_if_fail (GTK_IS_WIDGET (menuitem));
- priv->sec_activate_target = g_object_ref(G_OBJECT(menuitem));
+ priv->sec_activate_target = g_object_ref(menuitem);
priv->sec_activate_enabled = widget_is_menu_child(self, menuitem);
g_signal_connect(menuitem, "parent-set", G_CALLBACK(sec_activate_target_parent_changed), self);
}
{
"name": "libappindicator",
"build-options": {
"cflags": "-Wno-error=deprecated-declarations"
},
"rm-configure": true,
"config-opts": [
"--disable-static",
"--disable-gtk-doc",
"--disable-tests",
"--disable-mono-tests",
"--enable-introspection=no",
"--with-gtk=2"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/lib/*.la",
"/share/gtk-doc",
"/share/gir-1.0"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz",
"sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f"
},
{
"type": "patch",
"path": "libappindicator-ftbfs.patch"
},
{
"type": "shell",
"commands": [
"# Disable python bindings",
"sed -e '/APPINDICATOR_PYTHON/,/\\$PYGTK_CODEGEN/ d' -i configure.ac",
"sed -e '/bindings/ d' -e '/example/ d' -i Makefile.am"
]
},
{
"type": "script",
"commands": ["autoreconf -sfi"],
"dest-filename": "autogen.sh"
}
],
"modules": [
{
"name": "libdbusmenu",
"build-options": {
"env": {
"HAVE_VALGRIND_FALSE": "#",
"HAVE_VALGRIND_TRUE": ""
}
},
"cleanup": [
"/include",
"/libexec",
"/lib/pkgconfig",
"/lib/*.la",
"/share/doc",
"/share/libdbusmenu",
"/share/gtk-doc",
"/share/gir-1.0"
],
"config-opts": [
"--disable-static",
"--disable-gtk-doc",
"--enable-introspection=no",
"--disable-vala",
"--disable-dumper",
"--disable-tests",
"--with-gtk=2"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz",
"sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a"
}
]
},
{
"name": "libindicator",
"build-options": {
"cflags": "-Wno-error=deprecated-declarations"
},
"cleanup": [
"/include",
"/libexec",
"/lib/pkgconfig",
"/lib/*.la",
"/share/libindicator",
"/share/gtk-doc",
"/share/gir-1.0"
],
"config-opts": [
"--disable-static",
"--disable-tests",
"--with-gtk=2"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz",
"sha256": "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"
},
{
"type": "shell",
"commands": [
"# FTBFS fix",
"sed -e '/LIBINDICATOR_LIBS/ s/\\$LIBM/ $LIBM/' -i configure.ac"
]
},
{
"type": "script",
"commands": ["autoreconf -sfi"],
"dest-filename": "autogen.sh"
}
]
}
]
}
\ No newline at end of file
{
"name": "libappindicator",
"build-options": {
"cflags": "-Wno-error=deprecated-declarations"
},
"rm-configure": true,
"config-opts": [
"--disable-static",
"--disable-gtk-doc",
"--disable-tests",
"--disable-mono-tests",
"--enable-introspection=no",
"--with-gtk=3"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/lib/*.la",
"/share/gtk-doc",
"/share/gir-1.0"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz",
"sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f"
},
{
"type": "patch",
"path": "libappindicator-ftbfs.patch"
},
{
"type": "shell",
"commands": [
"# Disable python bindings",
"sed -e '/APPINDICATOR_PYTHON/,/\\$PYGTK_CODEGEN/ d' -i configure.ac",
"sed -e '/bindings/ d' -e '/example/ d' -i Makefile.am"
]
},
{
"type": "script",
"commands": ["autoreconf -sfi"],
"dest-filename": "autogen.sh"
}
],
"modules": [
{
"name": "libdbusmenu",
"build-options": {
"env": {
"HAVE_VALGRIND_FALSE": "#",
"HAVE_VALGRIND_TRUE": ""
}
},
"cleanup": [
"/include",
"/libexec",
"/lib/pkgconfig",
"/lib/*.la",
"/share/doc",
"/share/libdbusmenu",
"/share/gtk-doc",
"/share/gir-1.0"
],
"config-opts": [
"--disable-static",
"--disable-gtk-doc",
"--enable-introspection=no",
"--disable-vala",
"--disable-dumper",
"--disable-tests",
"--with-gtk=3"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libdbusmenu/16.04/16.04.0/+download/libdbusmenu-16.04.0.tar.gz",
"sha256": "b9cc4a2acd74509435892823607d966d424bd9ad5d0b00938f27240a1bfa878a"
}
]
},
{
"name": "libindicator",
"build-options": {
"cflags": "-Wno-error=deprecated-declarations"
},
"cleanup": [
"/include",
"/libexec",
"/lib/pkgconfig",
"/lib/*.la",
"/share/libindicator",
"/share/gtk-doc",
"/share/gir-1.0"
],
"config-opts": [
"--disable-static",
"--disable-tests",
"--with-gtk=3"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libindicator/12.10/12.10.1/+download/libindicator-12.10.1.tar.gz",
"sha256": "b2d2e44c10313d5c9cd60db455d520f80b36dc39562df079a3f29495e8f9447f"
},
{
"type": "shell",
"commands": [
"# FTBFS fix",
"sed -e '/LIBINDICATOR_LIBS/ s/\\$LIBM/ $LIBM/' -i configure.ac"
]
},
{
"type": "script",
"commands": ["autoreconf -sfi"],
"dest-filename": "autogen.sh"
}
]
}
]
}
\ No newline at end of file
{
"name": "libappindicator",
"build-options": {
"cflags": "-Wno-error=deprecated-declarations"
},
"rm-configure": true,
"config-opts": [
"--disable-static",
"--disable-gtk-doc",
"--disable-tests",
"--disable-mono-tests",
"--enable-introspection=yes",
"--with-gtk=3"
],
"cleanup": [
"/include",
"/lib/pkgconfig",
"/lib/*.la",
"/share/gtk-doc",
"/share/gir-1.0"
],
"sources": [
{
"type": "archive",
"url": "https://launchpad.net/libappindicator/12.10/12.10.0/+download/libappindicator-12.10.0.tar.gz",
"sha256": "d5907c1f98084acf28fd19593cb70672caa0ca1cf82d747ba6f4830d4cc3b49f"
},
{
"type": "patch",