diff --git a/.gitignore b/.gitignore index 857a48957..6c1c57caa 100644 --- a/.gitignore +++ b/.gitignore @@ -125,7 +125,7 @@ TAGS # generated packages *.zip *.exe -*.sh +#*.sh *.deb *.rpm *.dmg @@ -133,7 +133,7 @@ TAGS *.tar.gz # packaging related files -!packaging/scripts/prepare_deb_freerdp-nightly.sh +!packaging/**.sh packaging/deb/freerdp-nightly/freerdp-nightly packaging/deb/freerdp-nightly/freerdp-nightly-dev packaging/deb/freerdp-nightly/freerdp-nightly-dbg diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index b43f00299..7f672c9d7 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -7,7 +7,7 @@ "cflags": "-O2 -g", "cxxflags": "-O2 -g" }, - "command": "xfreerdp", + "command": "freerdp.sh", "cleanup": [ ], "finish-args": [ @@ -69,6 +69,19 @@ } ] }, + { + "name": "wrapper", + "buildsystem": "simple", + "build-commands": [ + "install -D freerdp.sh /app/bin/freerdp.sh" + ], + "sources": [ + { + "type": "file", + "path": "freerdp.sh" + } + ] + }, { "name": "freerdp", "buildsystem": "cmake-ninja", diff --git a/packaging/flatpak/freerdp.sh b/packaging/flatpak/freerdp.sh new file mode 100755 index 000000000..1f62b8b7d --- /dev/null +++ b/packaging/flatpak/freerdp.sh @@ -0,0 +1,18 @@ +#!/bin/sh +if [ -z $XDG_SESSION_TYPE ]; +then + echo "XDG_SESSION_TYPE undefined" + exit -1 +elif [ "$XDG_SESSION_TYPE" = "wayland" ]; +then + echo "wayland $(which wlfreerdp)" + wlfreerdp $@ +elif [ "$XDG_SESSION_TYPE" = "x11" ]; +then + echo "X11 $(which xfreerdp)" + xfreerdp $@ + exit $rc +else + echo "XDG_SESSION_TYPE $XDG_SESSION_TYPE not handled" + exit -1 +fi diff --git a/packaging/flatpak/shared-modules/dbus-glib/dbus-glib-0.110.json b/packaging/flatpak/shared-modules/dbus-glib/dbus-glib-0.110.json index 7f51e8f22..73ffd084e 100644 --- a/packaging/flatpak/shared-modules/dbus-glib/dbus-glib-0.110.json +++ b/packaging/flatpak/shared-modules/dbus-glib/dbus-glib-0.110.json @@ -1,1012 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - shared-modules/dbus-glib-0.110.json at master · flathub/shared-modules - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Skip to content -
- - - - - - - - - - - -
- -
- -
- -
- - - -
-
-
- - - - - - - - - - -
-
- -
    -
  • -
    - -
    - - - - Watch - - - -
    - Notifications -
    -
    - - - - - - - -
    -     -
    - -
    -
    • - -
  • -
    -
    - - - -
    -
    - - - -
    - -
    • - -
  • -
    - - - Fork - - -
    - -

    Fork shared-modules

    -
    -
    - - -

    If this dialog fails to load, you can visit the fork page directly.

    -     -
    -     -
    - - -
    • -
- -

- - /shared-modules - -

- -
- - - - -
- -
-
- - - - - - - - Permalink - - - - - -
- -
- - -
- -
-
- - Switch branches/tags -
- - -
-
- -
-
-
    -
  • - -
    • -
  • - -
    • -
-
-
- -
- - -
Nothing to show
-
- - - -
-
-
- -
- - Find file - - - Copy path - -
- -
- - - -
- Fetching contributors… -
- -
- - Cannot retrieve contributors at this time -
- - - -
- -
- -
- - -
- Raw - Blame - History -
- - -
- -
-
- -
- -
- 24 lines (23 sloc) - - 528 Bytes -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{
"name": "dbus-glib",
"cleanup": [
"*.la",
"/bin",
"/etc",
"/include",
"/libexec",
"/share/gtk-doc",
"/share/man"
],
"config-opts": [
"--disable-static",
"--disable-gtk-doc"
],
"sources": [
{
"type": "archive",
"url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz",
"sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825"
}
]
}
- - - -
- -
- - - -
- - -
- - -
 -
- - - -
-
-
- -
-
- -
- - - - - - -
- - - You can’t perform that action at this time. -
- - - - - - - - - -
- - You signed in with another tab or window. Reload to refresh your session. - You signed out in another tab or window. Reload to refresh your session. -
- - - - - - -
- Press h to open a hovercard with more details. -
- -
- - - - +{ + "name": "dbus-glib", + "cleanup": [ + "*.la", + "/bin", + "/etc", + "/include", + "/libexec", + "/share/gtk-doc", + "/share/man" + ], + "config-opts": [ + "--disable-static", + "--disable-gtk-doc" + ], + "sources": [ + { + "type": "archive", + "url": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.110.tar.gz", + "sha256": "7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825" + } + ] +} diff --git a/packaging/flatpak/shared-modules/udev/udev-175.json b/packaging/flatpak/shared-modules/udev/udev-175.json index 657914d0c..a456dea8d 100644 --- a/packaging/flatpak/shared-modules/udev/udev-175.json +++ b/packaging/flatpak/shared-modules/udev/udev-175.json @@ -1,1092 +1,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - shared-modules/udev-175.json at master · flathub/shared-modules - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Skip to content -
- - - - - - - - - - - -
- -
- -
- -
- - - -
-
-
- - - - - - - - - - -
-
- -
    -
  • -
    - -
    - - - - Watch - - - -
    - Notifications -
    -
    - - - - - - - -
    -     -
    - -
    -
    • - -
  • -
    -
    - - - -
    -
    - - - -
    - -
    • - -
  • -
    - - - Fork - - -
    - -

    Fork shared-modules

    -
    -
    - - -

    If this dialog fails to load, you can visit the fork page directly.

    -     -
    -     -
    - - -
    • -
- -

- - /shared-modules - -

- -
- - - - -
- -
-
- - - - - - - - Permalink - - - - - -
- -
- - -
- -
-
- - Switch branches/tags -
- - -
-
- -
-
-
    -
  • - -
    • -
  • - -
    • -
-
-
- -
- - -
Nothing to show
-
- - - -
-
-
- -
- - Find file - - - Copy path - -
- -
- - - -
- Fetching contributors… -
- -
- - Cannot retrieve contributors at this time -
- - - -
- -
- -
- - -
- Raw - Blame - History -
- - -
- -
-
- -
- -
- 44 lines (43 sloc) - - 877 Bytes -
-
- - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{
"name": "udev",
"rm-configure": true,
"config-opts": [
"--disable-hwdb",
"--disable-logging",
"--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": "archive",
"url": "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2",
"sha256": "4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab"
},
{
"type": "script",
"dest-filename": "autogen.sh",
"commands": [
"autoreconf -vfi"
]
}
],
"post-install": [
"sed -i 's|${exec_prefix}|/app|g' /app/share/pkgconfig/udev.pc"
]
}
- - - -
- -
- - - -
- - -
- - -
 -
- - - -
-
-
- -
-
- -
- - - - - - -
- - - You can’t perform that action at this time. -
- - - - - - - - - -
- - You signed in with another tab or window. Reload to refresh your session. - You signed out in another tab or window. Reload to refresh your session. -
- - - - - - -
- Press h to open a hovercard with more details. -
- -
- - - - +{ + "name": "udev", + "rm-configure": true, + "config-opts": [ + "--disable-hwdb", + "--disable-logging", + "--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": "archive", + "url": "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-175.tar.bz2", + "sha256": "4c7937fe5a1521316ea571188745b9a00a9fdf314228cffc53a7ba9e5968b7ab" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -vfi" + ] + } + ], + "post-install": [ + "sed -i 's|${exec_prefix}|/app|g' /app/share/pkgconfig/udev.pc" + ] +}