这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
diff --git a/meson.build b/meson.build
index 1a9c1d0..a41b629 100644
--- a/meson.build
+++ b/meson.build
@@ -151,7 +151,7 @@ libstemmer = cc.find_library('stemmer', required: get_option('stemmer'))
have_libstemmer = libstemmer.found()

if meson.is_cross_build() and not meson.has_exe_wrapper()
- sqlite3_fts5 = meson.get_cross_property('sqlite3_has_fts5')
+ sqlite3_fts5 = meson.get_cross_property('sqlite3_has_fts5', 'true')
if sqlite3_fts5 == ''
error('Please assign an appropriate value for sqlite3_has_fts5 in the [properties] section of your crossfile')
elif sqlite3_fts5 == 'true'
@@ -188,11 +188,18 @@ elif not sqlite_is_subproject
if result.returncode() != 0
error('SQLite has no builtin FTS5.')
endif
+else
+ sqlite3_has_builtin_fts5 = true
endif

##################################################################
# Get an appropriate 4-digit year modifier for strftime
##################################################################
+if meson.is_cross_build() and not meson.has_exe_wrapper()
+ # Use standard %Y for cross-builds where we can't run tests
+ year_modifier = '%Y'
+ message('Cross-build detected: using standard %Y year modifier')
+else
result = cc.run('''
#define _TIME_BITS 64
#define _GNU_SOURCE
@@ -219,10 +226,12 @@ result = cc.run('''
''',
name: 'strftime 4-digit year modifier')

-if not result.compiled() or result.returncode() != 0
- error('Libc implementation has broken 4-digit years implementation.')
-else
- year_modifier = result.stdout()
+ if not result.compiled() or result.returncode() != 0
+ warning('Could not determine year modifier, using standard %Y')
+ year_modifier = '%Y'
+ else
+ year_modifier = result.stdout()
+ endif
endif

##################################################################
15 changes: 15 additions & 0 deletions packages/tinysparql/0002-fix-tmp-paths.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
diff --git a/tests/common/tracker-file-utils-test.c b/tests/common/tracker-file-utils-test.c
index b200820..a038a8b 100644
--- a/tests/common/tracker-file-utils-test.c
+++ b/tests/common/tracker-file-utils-test.c
@@ -71,8 +71,8 @@ static void
test_file_system_has_enough_space ()
{
/* Hopefully we will always have 1 byte free... */
- g_assert_true (tracker_file_system_has_enough_space ("/tmp", 1, FALSE));
- g_assert_true (tracker_file_system_has_enough_space ("/tmp", 1, TRUE));
+ g_assert_true (tracker_file_system_has_enough_space ("@TERMUX_PREFIX@/tmp", 1, FALSE));
+ g_assert_true (tracker_file_system_has_enough_space ("@TERMUX_PREFIX@/tmp", 1, TRUE));

/* gulong goes only up to 4Gb. Cannot ask for unreasonable amount of space */
//g_assert_true (!tracker_file_system_has_enough_space ("/home", G_MAXULONG, FALSE));
13 changes: 13 additions & 0 deletions packages/tinysparql/0003-fix-usr-paths.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/utils/data-generators/create-tree-from-real-data b/utils/data-generators/create-tree-from-real-data
index 6fc5a37..28d3aa9 100755
--- a/utils/data-generators/create-tree-from-real-data
+++ b/utils/data-generators/create-tree-from-real-data
@@ -37,7 +37,7 @@ def argument_parser():
parser = argparse.ArgumentParser(
description="Assemble test data for the Tracker extractors.")
parser.add_argument(
- '--rules-dir', default='/usr/share/tracker/extract-rules',
+ '--rules-dir', default='@TERMUX_PREFIX@/share/tracker/extract-rules',
help="location to find Tracker extract rules (default: %(default)s)")
parser.add_argument(
'--output-dir', default=None,
27 changes: 27 additions & 0 deletions packages/tinysparql/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
TERMUX_PKG_HOMEPAGE=https://gnome.pages.gitlab.gnome.org/tinysparql
TERMUX_PKG_DESCRIPTION="Desktop-neutral metadata-based search framework"
TERMUX_PKG_LICENSE="LGPL-2.1-or-later"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=3.9.2
TERMUX_PKG_SRCURL=https://github.com/GNOME/tinysparql/archive/refs/tags/${TERMUX_PKG_VERSION}.tar.gz
TERMUX_PKG_SHA256=387fc277889f64e2beea7ac5be2532e937c803e216fcf949ab4e4d96f9726d62
TERMUX_PKG_DEPENDS="libicu, dbus, pygobject, python, json-glib, libxml2, sqlite"
TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, icu-devtools, libsoup3, asciidoc, xorgproto, valac, gettext, libstemmer, binutils"
TERMUX_PKG_PYTHON_COMMON_DEPS="docutils, setuptools"
TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-Ddocs=false
-Dbash_completion=false
-Dsystemd_user_services=false
-Dintrospection=disabled
-Dvapi=disabled
-Dtests=false
-Doverride_sqlite_version_check=true
"

termux_step_post_get_source() {
rm -f subprojects/*.wrap
}

termux_step_pre_configure() {
termux_setup_glib_cross_pkg_config_wrapper
}
27 changes: 27 additions & 0 deletions packages/upower/build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
TERMUX_PKG_HOMEPAGE=https://upower.freedesktop.org/
TERMUX_PKG_DESCRIPTION="Power management support for DeviceKit"
TERMUX_PKG_LICENSE="GPL-2.0-or-later"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="1.90.9"
TERMUX_PKG_SRCURL="https://gitlab.freedesktop.org/upower/upower/-/archive/v$TERMUX_PKG_VERSION/upower-v$TERMUX_PKG_VERSION.tar.gz"
TERMUX_PKG_SHA256=fffd45c50d29ed73ecdcfb11c3a7bb042ef14e84b14b0c2d5fdb78c7b4435d6c
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="glib, gobject-introspection"
TERMUX_PKG_BUILD_DEPENDS="g-ir-scanner, glib-cross"
TERMUX_PKG_VERSIONED_GIR=false

TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
-Dintrospection=enabled
-Dos_backend=dummy
-Dpolkit=disabled
-Dsystemdsystemunitdir=no
-Dgtk-doc=false
-Dman=false
"

termux_step_pre_configure() {
termux_setup_gir
termux_setup_glib_cross_pkg_config_wrapper

export TERMUX_MESON_ENABLE_SOVERSION=1
}
62 changes: 62 additions & 0 deletions packages/upower/gir/UPowerGlib-1.0.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0"?>
<dump>
<class name="UpDevice" get-type="up_device_get_type" parents="GObject">
<property name="update-time" type="guint64" flags="3" default-value="0"/>
<property name="vendor" type="gchararray" flags="3" default-value="NULL"/>
<property name="model" type="gchararray" flags="3" default-value="NULL"/>
<property name="serial" type="gchararray" flags="3" default-value="NULL"/>
<property name="native-path" type="gchararray" flags="3" default-value="NULL"/>
<property name="power-supply" type="gboolean" flags="3" default-value="FALSE"/>
<property name="online" type="gboolean" flags="3" default-value="FALSE"/>
<property name="is-present" type="gboolean" flags="3" default-value="FALSE"/>
<property name="is-rechargeable" type="gboolean" flags="3" default-value="FALSE"/>
<property name="has-history" type="gboolean" flags="3" default-value="FALSE"/>
<property name="has-statistics" type="gboolean" flags="3" default-value="FALSE"/>
<property name="kind" type="guint" flags="3" default-value="0"/>
<property name="state" type="guint" flags="3" default-value="0"/>
<property name="technology" type="guint" flags="3" default-value="0"/>
<property name="capacity" type="gdouble" flags="3" default-value="100.000000"/>
<property name="energy" type="gdouble" flags="3" default-value="0.000000"/>
<property name="energy-empty" type="gdouble" flags="3" default-value="0.000000"/>
<property name="energy-full" type="gdouble" flags="3" default-value="0.000000"/>
<property name="energy-full-design" type="gdouble" flags="3" default-value="0.000000"/>
<property name="energy-rate" type="gdouble" flags="3" default-value="0.000000"/>
<property name="voltage" type="gdouble" flags="3" default-value="0.000000"/>
<property name="luminosity" type="gdouble" flags="3" default-value="0.000000"/>
<property name="time-to-empty" type="gint64" flags="3" default-value="0"/>
<property name="time-to-full" type="gint64" flags="3" default-value="0"/>
<property name="percentage" type="gdouble" flags="3" default-value="100.000000"/>
<property name="temperature" type="gdouble" flags="3" default-value="0.000000"/>
<property name="warning-level" type="guint" flags="3" default-value="0"/>
<property name="battery-level" type="guint" flags="3" default-value="1"/>
<property name="icon-name" type="gchararray" flags="3" default-value="NULL"/>
<property name="charge-cycles" type="gint" flags="3" default-value="-1"/>
<property name="charge-start-threshold" type="guint" flags="3" default-value="0"/>
<property name="charge-end-threshold" type="guint" flags="3" default-value="100"/>
<property name="charge-threshold-enabled" type="gboolean" flags="3" default-value="FALSE"/>
<property name="charge-threshold-supported" type="gboolean" flags="3" default-value="FALSE"/>
</class>
<class name="UpClient" get-type="up_client_get_type" parents="GObject">
<implements name="GInitable"/>
<implements name="GAsyncInitable"/>
<property name="daemon-version" type="gchararray" flags="1" default-value="NULL"/>
<property name="on-battery" type="gboolean" flags="1" default-value="FALSE"/>
<property name="lid-is-closed" type="gboolean" flags="-2147483647" default-value="FALSE"/>
<property name="lid-is-present" type="gboolean" flags="-2147483647" default-value="FALSE"/>
<signal name="device-added" return="void" when="last">
<param type="UpDevice"/>
</signal>
<signal name="device-removed" return="void" when="last">
<param type="gchararray"/>
</signal>
</class>
<class name="UpHistoryItem" get-type="up_history_item_get_type" parents="GObject">
<property name="value" type="gdouble" flags="3" default-value="0.000000"/>
<property name="time" type="guint" flags="3" default-value="0"/>
<property name="state" type="guint" flags="3" default-value="0"/>
</class>
<class name="UpStatsItem" get-type="up_stats_item_get_type" parents="GObject">
<property name="value" type="gdouble" flags="3" default-value="0.000000"/>
<property name="accuracy" type="gdouble" flags="3" default-value="0.000000"/>
</class>
</dump>
101 changes: 101 additions & 0 deletions x11-packages/cinnamon-control-center/0001-disable-polkit.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
diff --git a/meson.build b/meson.build
index 992b5a3..a0e558c 100644
--- a/meson.build
+++ b/meson.build
@@ -33,9 +33,15 @@ libgnomekbd = dependency('libgnomekbd', version: '>=3.0.0')
libgnomekbdui=dependency('libgnomekbdui', version: '>=3.0.0')
libnotify = dependency('libnotify', version: '>=0.7.3')
libx11 = dependency('x11')
-polkit_gobj = dependency('polkit-gobject-1',version: '>=0.103')
libxklavier = dependency('libxklavier', version: '>=5.1')
upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
+have_polkit = get_option('polkit')
+if have_polkit
+ polkit_gobj = dependency('polkit-gobject-1', version: '>=0.103')
+else
+ polkit_gobj = dependency('', required: false)
+endif
+config.set10('HAVE_POLKIT', have_polkit)

config.set('HAVE_X11_EXTENSIONS_XKB_H', cc.has_header('X11/extensions/XKB.h'))

@@ -180,6 +186,7 @@ final_message = [ '',
'** ModemManager support : @0@'.format(modemmanager.found()),
'** Colord support (Color management panel) : @0@'.format(colord.found()),
'** Wacom support (Wacom panel) : @0@'.format(libwacom.found()),
+ '** Polkit support : @0@'.format(have_polkit),
'** Wayland support : @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)),
'',
]
diff --git a/meson_options.txt b/meson_options.txt
index f437836..89ecaeb 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -4,4 +4,5 @@ option('networkmanager',type: 'boolean', value: 'true', description: 'NetworkMan
option('onlineaccounts',type: 'boolean', value: 'true', description: 'Online Accounts support')
option('wacom', type: 'boolean', value: 'true', description: 'Wacom Management support')
option('deprecated_warnings', type : 'boolean', value : false,
- description: 'Show compiler warnings about deprecated features')
\ No newline at end of file
+ description: 'Show compiler warnings about deprecated features')
+option('polkit', type: 'boolean', value: true, description: 'Enable polkit support')
diff --git a/panels/network/meson.build b/panels/network/meson.build
index 37de3bb..01a655a 100644
--- a/panels/network/meson.build
+++ b/panels/network/meson.build
@@ -24,6 +24,17 @@ if modemmanager.found()
panel_network_sources += 'net-device-mobile.c'
endif

+panel_network_deps = [
+ glib,
+ gtk,
+ libnm,
+ libnma,
+ modemmanager,
+]
+
+if have_polkit
+ panel_network_deps += polkit_gobj
+endif

panel_network = shared_library('network',
panel_network_sources,
@@ -34,15 +45,7 @@ panel_network = shared_library('network',
link_with: [
libcinnamon_control_center,
],
- dependencies: [
- glib,
- gtk,
- libnm,
- libnma,
- modemmanager,
- polkit_gobj,
- ],
-
+ dependencies: panel_network_deps,
install: true,
install_dir: panels_dir
)
@@ -55,4 +58,4 @@ install_data('network.ui',
install_data(
'cinnamon-network-panel.desktop',
install_dir: desktop_dir
-)
\ No newline at end of file
+)
diff --git a/panels/network/net-device-wifi.c b/panels/network/net-device-wifi.c
index af567ae..270081a 100644
--- a/panels/network/net-device-wifi.c
+++ b/panels/network/net-device-wifi.c
@@ -27,7 +27,9 @@
#include <netinet/ether.h>

#include <NetworkManager.h>
+#ifdef HAVE_POLKIT
#include <polkit/polkit.h>
+#endif

#include "shell/list-box-helper.h"
#include "shell/hostname-helper.h"
Loading
Loading