|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager.changes
|
|
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager.spec
^
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -6,4 +6,5 @@
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
-</service></services>
+</service>
+</services>
|
|
[-]
[+]
|
Added |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/.github/workflows/build.yml
^
|
| @@ -0,0 +1,59 @@
+name: Github CI build
+
+on:
+ push:
+ tags:
+ - '*'
+ pull_request:
+ branches:
+ - master
+ - patchmanager3
+
+env:
+ RELEASE: 4.0.1.45
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v2
+
+ - name: Prepare
+ run: mkdir output
+
+ - name: Build armv7hl
+ run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
+ mkdir -p build ;
+ cd build ;
+ cp -r /share/* . ;
+ mb2 -t SailfishOS-$RELEASE-armv7hl build ;
+ sudo cp -r RPMS/*.rpm /share/output"
+
+ - name: Build i486
+ run: docker run --rm --privileged -v $PWD:/share coderus/sailfishos-platform-sdk:$RELEASE /bin/bash -c "
+ mkdir -p build ;
+ cd build ;
+ cp -r /share/* . ;
+ mb2 -t SailfishOS-$RELEASE-i486 build ;
+ sudo cp -r RPMS/*.rpm /share/output"
+
+ - name: Upload build result
+ uses: actions/upload-artifact@v2
+ with:
+ name: output-rpms
+ path: output
+
+ - name: Create release
+ if: contains(github.ref, 'release')
+ run: |
+ set -x
+ assets=()
+ for asset in output/*.rpm; do
+ assets+=("-a" "$asset")
+ done
+ tag_name="${GITHUB_REF##*/}"
+ hub release create "${assets[@]}" -m "$tag_name" "$tag_name"
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/.gitignore
^
|
| @@ -3,5 +3,13 @@
src/bin/patchmanager-daemon/adaptor.*
*.rpm
+*.so*
+Makefile
+*.o
+moc_*
+*.moc
+patchmanager_interface.*
+patchmanager_adaptor.*
+patchmanager-dialog
.build*
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/bin/dialog/main.cpp
^
|
| @@ -11,29 +11,6 @@
#include <QDBusReply>
#include <QTimer>
-QString getLang()
-{
- QString lang = QStringLiteral("en_US.utf8");
-
- QFile localeConfig(QStringLiteral("/var/lib/environment/nemo/locale.conf"));
-
- if (!localeConfig.exists() || !localeConfig.open(QFile::ReadOnly)) {
- return lang;
- }
-
- while (!localeConfig.atEnd()) {
- QString line = localeConfig.readLine().trimmed();
- if (line.startsWith(QStringLiteral("LANG="))) {
- lang = line.mid(5);
- break;
- }
- }
-
- qDebug() << Q_FUNC_INFO << lang;
-
- return lang;
-}
-
int main(int argc, char *argv[])
{
qputenv("NO_PM_PRELOAD", "1");
@@ -47,7 +24,7 @@
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
QTranslator translator;
- bool success = translator.load(QLocale(getLang()),
+ bool success = translator.load(QLocale(),
QStringLiteral("settings-patchmanager"),
QStringLiteral("-"),
QStringLiteral("/usr/share/translations/"),
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/bin/patchmanager-daemon/patchmanager-daemon.pro
^
|
| @@ -4,11 +4,10 @@
QT = core dbus network
CONFIG += link_pkgconfig
PKGCONFIG += nemonotifications-qt5
-PKGCONFIG += libsystemd-journal
+PKGCONFIG += libsystemd
PKGCONFIG += rpm
PKGCONFIG += popt
-INCLUDEPATH += /usr/include
INCLUDEPATH += /usr/include/rpm
isEmpty(PROJECT_PACKAGE_VERSION) {
@@ -55,7 +54,7 @@
systemd/dbus-org.SfietKonstantin.patchmanager.service \
systemd/checkForUpdates-org.SfietKonstantin.patchmanager.service \
systemd/checkForUpdates-org.SfietKonstantin.patchmanager.timer
-systemd.path = /lib/systemd/system/
+systemd.path = /usr/lib/systemd/system/
INSTALLS += systemd
env.files = environment/10-dbus.conf
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/bin/patchmanager-daemon/patchmanagerobject.cpp
^
|
| @@ -132,17 +132,23 @@
{
QString lang = QStringLiteral("en_US.utf8");
- QFile localeConfig(QStringLiteral("/var/lib/environment/nemo/locale.conf"));
+ QStringList locales = {
+ QStringLiteral("/etc/locale.conf"),
+ QStringLiteral("/var/lib/environment/nemo/locale.conf"),
+ };
+ for (const QString &localePath : locales) {
+ QFile localeConfig(localePath);
- if (!localeConfig.exists() || !localeConfig.open(QFile::ReadOnly)) {
- return lang;
- }
+ if (!localeConfig.exists() || !localeConfig.open(QFile::ReadOnly)) {
+ continue;
+ }
- while (!localeConfig.atEnd()) {
- QString line = localeConfig.readLine().trimmed();
- if (line.startsWith(QStringLiteral("LANG="))) {
- lang = line.mid(5);
- break;
+ while (!localeConfig.atEnd()) {
+ QString line = localeConfig.readLine().trimmed();
+ if (line.startsWith(QStringLiteral("LANG="))) {
+ lang = line.mid(5);
+ break;
+ }
}
}
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/icons/icons.pro
^
|
| @@ -1,4 +1,29 @@
TEMPLATE = aux
# Configures svg to png
THEMENAME=sailfish-default
-CONFIG += sailfish-svg2png
\ No newline at end of file
+
+load(sailfish-svg2png-sizes)
+
+theme.path = /usr/share/themes/$${THEMENAME}/
+themeDirectory.path = /usr/share/themes/$${THEMENAME}/meegotouch
+themeDirectory.files += $${OUT_PWD}/icons
+
+for(profile, SAILFISH_SVG2PNG.profiles) {
+ # a work-around for installing directories that do not exist yet
+ system(mkdir -p $${OUT_PWD}/z$${profile})
+
+ exists( $${OUT_PWD}/symlinks ): svg2png.commands += cp -r symlinks/icons z$${profile} &&
+
+ svg2png.commands += /usr/bin/sailfish_svg2png \
+ -z $$eval(SAILFISH_SVG2PNG.scales.$${profile}) \
+ $$eval(SAILFISH_SVG2PNG.extra.$${profile}) \
+ $${_PRO_FILE_PWD_}/svgs \
+ z$${profile}/icons &&
+
+ svg2png.files += $${OUT_PWD}/z$${profile}
+}
+
+svg2png.commands += true
+svg2png.path = $${themeDirectory.path}
+
+INSTALLS += svg2png theme themeDirectory
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/preload/preload.pro
^
|
| @@ -1,6 +1,9 @@
TEMPLATE = lib
QT =
CONFIG += plugin
+CONFIG += link_pkgconfig
+PKGCONFIG += libshadowutils
+INCLUDEPATH += /usr/include/libshadowutils
QMAKE_CFLAGS += -std=c11
LIBS = -ldl
|
|
[-]
[+]
|
Changed |
_service:tar_git:patchmanager-3.0.65+sfos4.fix.busybox.tar.bz2/src/preload/src/preloadpatchmanager.c
^
|
| @@ -26,6 +26,7 @@
#include <limits.h>
#include <libgen.h>
+#include <getdef.h>
#include <pwd.h>
#define SERVER_PATH "/tmp/patchmanager-socket"
@@ -95,18 +96,9 @@
close(sockfd);
}
-static uid_t nemo_uid()
+static uid_t user_uid()
{
- static struct passwd *nemo_pwd;
-
- if (!nemo_pwd) {
- nemo_pwd = getpwnam("nemo");
- if (!nemo_pwd) {
- return 100000;
- }
- }
-
- return nemo_pwd->pw_uid;
+ return getdef_num("UID_MIN", 100000);
}
static int pm_validate_uid(uid_t uid)
@@ -114,7 +106,7 @@
#ifdef ALLOW_ALL_USERS
return 1;
#else // #ifdef ALLOW_ALL_USERS
- return uid == nemo_uid();
+ return uid >= user_uid();
#endif // #ifdef ALLOW_ALL_USERS
}
|
