@pheem49/mint 1.8.1 → 1.8.2

package/shared-modules/clutter/clutter.json

@@ -0,0 +1,72 @@
+{
+    "name": "clutter-gtk",
+    "cleanup": [
+        "/share/gtk-doc"
+    ],
+    "sources": [
+        {
+            "type": "archive",
+            "url": "https://download.gnome.org/sources/clutter-gtk/1.8/clutter-gtk-1.8.4.tar.xz",
+            "sha256": "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06"
+        }
+    ],
+    "modules": [
+        {
+            "name": "cogl",
+            "build-options": {
+                "cflags": "-std=gnu18"
+            },
+            "config-opts": [
+                "--disable-cogl-gst",
+                "--disable-gtk-doc",
+                "--enable-xlib-egl-platform",
+                "--enable-wayland-egl-platform"
+            ],
+            "cleanup": [
+                "/share/gtk-doc",
+                "/share/cogl/examples-data"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/cogl/1.22/cogl-1.22.8.tar.xz",
+                    "sha256": "a805b2b019184710ff53d0496f9f0ce6dcca420c141a0f4f6fcc02131581d759"
+                }
+            ]
+        },
+        {
+            "name": "clutter",
+            "config-opts": [
+                "--disable-gtk-doc",
+                "--enable-egl-backend",
+                "--enable-wayland-backend"
+            ],
+            "cleanup": [
+                "/share/gtk-doc"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/clutter/1.26/clutter-1.26.4.tar.xz",
+                    "sha256": "8b48fac159843f556d0a6be3dbfc6b083fc6d9c58a20a49a6b4919ab4263c4e6"
+                }
+            ]
+        },
+        {
+            "name": "clutter-gst",
+            "config-opts": [
+                "--disable-gtk-doc"
+            ],
+            "cleanup": [
+                "/share/gtk-doc"
+            ],
+            "sources": [
+                {
+                    "type": "archive",
+                    "url": "https://download.gnome.org/sources/clutter-gst/3.0/clutter-gst-3.0.27.tar.xz",
+                    "sha256": "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d"
+                }
+            ]
+        }
+    ]
+}

package/shared-modules/dbus-glib/dbus-glib.json

@@ -0,0 +1,29 @@
+{
+    "name": "dbus-glib",
+    "cleanup": [
+        "*.la",
+        "/bin",
+        "/etc",
+        "/include",
+        "/lib/pkgconfig",
+        "/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.114.tar.gz",
+            "sha256": "c09c5c085b2a0e391b8ee7d783a1d63fe444e96717cc1814d61b5e8fc2827a7c",
+            "x-checker-data": {
+                "type": "anitya",
+                "project-id": 1979,
+                "url-template": "https://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-$version.tar.gz"
+            }
+        }
+    ]
+}

package/shared-modules/glew/glew.json

@@ -0,0 +1,36 @@
+{
+        "name": "glew",
+        "no-autogen": true,
+        "make-args": [
+                "GLEW_PREFIX=${FLATPAK_DEST}",
+                "GLEW_DEST=${FLATPAK_DEST}",
+                "LIBDIR=${FLATPAK_DEST}/lib",
+                "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
+                "LDFLAGS.EXTRA=${LDFLAGS}"
+        ],
+        "make-install-args": [
+                "GLEW_PREFIX=${FLATPAK_DEST}",
+                "GLEW_DEST=${FLATPAK_DEST}",
+                "LIBDIR=${FLATPAK_DEST}/lib",
+                "CFLAGS.EXTRA:=${CFLAGS} -fPIC",
+                "LDFLAGS.EXTRA=${LDFLAGS}"
+        ],
+        "sources": [
+                {
+                        "type": "archive",
+                        "url": "https://github.com/nigels-com/glew/releases/download/glew-2.3.1/glew-2.3.1.tgz",
+                        "sha256": "b64790f94b926acd7e8f84c5d6000a86cb43967bd1e688b03089079799c9e889",
+                        "x-checker-data": {
+                            "type": "anitya",
+                            "project-id": 7878,
+                            "stable-only": true,
+                            "url-template": "https://github.com/nigels-com/glew/releases/download/glew-$version/glew-$version.tgz"
+                        }
+                }
+        ],
+        "cleanup": [
+                "/include",
+                "/lib/pkgconfig",
+                "/lib/*.a"
+        ]
+}

package/shared-modules/glu/glu-9.json

@@ -0,0 +1,12 @@
+{
+  "name": "glu",
+  "buildsystem": "meson",
+  "sources": [
+    {
+      "type": "archive",
+      "url": "https://archive.mesa3d.org/glu/glu-9.0.3.tar.xz",
+      "sha256": "bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f"
+    }
+  ],
+  "cleanup": [ "/include", "/lib/*.a", "/lib/*.la", "/lib/pkgconfig" ]
+}

package/shared-modules/gtk2/arc-gtk2-theme-Replace-Inkscape-dependency-with-rsvg-convert.patch

@@ -0,0 +1,180 @@
+From d5e0034183564df5fec8e4dde1705116c7b38021 Mon Sep 17 00:00:00 2001
+From: Patrick Griffis <tingping@tingping.se>
+Date: Sat, 16 May 2020 18:00:36 -0700
+Subject: [PATCH] Replace Inkscape dependency with rsvg-convert
+
+rsvg-convert is a *much* smaller dependency that all systems with
+a functioning GTK installation should have easy access to.
+---
+ common/gtk-2.0/Makefile.am     |  6 +-----
+ common/gtk-2.0/render-asset.sh | 16 ++++++++--------
+ common/gtk-3.0/common.am       | 12 ++----------
+ common/xfwm4/Makefile.am       |  6 +-----
+ common/xfwm4/render-asset.sh   | 16 ++++++++--------
+ configure.ac                   |  8 ++------
+ 6 files changed, 22 insertions(+), 42 deletions(-)
+
+diff --git a/common/gtk-2.0/Makefile.am b/common/gtk-2.0/Makefile.am
+index 010823a..873013a 100644
+--- a/common/gtk-2.0/Makefile.am
++++ b/common/gtk-2.0/Makefile.am
+@@ -35,11 +35,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
+ 
+ $(light) $(dark):
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ menubar-toolbar/%-dark.png: dark/assets/%.png | menubar-toolbar
+diff --git a/common/gtk-2.0/render-asset.sh b/common/gtk-2.0/render-asset.sh
+index 6685414..f6198af 100755
+--- a/common/gtk-2.0/render-asset.sh
++++ b/common/gtk-2.0/render-asset.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -ueo pipefail
+ 
+-INKSCAPE="$(which inkscape)"
++RSVG_CONVERT="$(which rsvg-convert)"
+ OPTIPNG="$(which optipng)"
+ 
+ ASSETS_DIR="$1"
+@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
+ 	echo "${result_file} already exists."
+ else
+ 	echo "Rendering '${result_file}'"
+-	"$INKSCAPE" --export-id="$i" \
+-				--export-id-only \
+-				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
++	"$RSVG_CONVERT" --export-id="$i" \
++                        --format=png
++                        --output="${result_file}" "$SRC_FILE" >/dev/null \
+ 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
+ fi
+ 
+@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
+ 		echo "${result_file_hidpi} already exists."
+ 	else
+ 		echo "Rendering '${result_file_hidpi}'"
+-		"$INKSCAPE" --export-id="$i" \
+-					--export-id-only \
+-					--export-dpi=192 \
+-					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
++		"$RSVG_CONVERT" --export-id="$i" \
++				--dpi-x=192 --dpi-y=192 \
++				--format=png
++			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
+ 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
+ 	fi
+ fi
+diff --git a/common/gtk-3.0/common.am b/common/gtk-3.0/common.am
+index a93d01d..9e4b102 100644
+--- a/common/gtk-3.0/common.am
++++ b/common/gtk-3.0/common.am
+@@ -14,19 +14,11 @@ clean:
+ 	rm -rf assets/ light/ dark/ darker/ lighter/
+ 
+ $(normal): $(srcdir)/assets.svg | assets
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=96 "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=96 --dpi-x=96 "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ $(hidpi): $(srcdir)/assets.svg | assets
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --export-dpi=192 "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(patsubst %@2,%,$(basename $(notdir $@)))" --dpi-y=192 --dpi-x=192 "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ .PHONY: normal hidpi clean
+diff --git a/common/xfwm4/Makefile.am b/common/xfwm4/Makefile.am
+index e5fbdc5..1f21183 100644
+--- a/common/xfwm4/Makefile.am
++++ b/common/xfwm4/Makefile.am
+@@ -17,11 +17,7 @@ $(light): $(srcdir)/light/assets.svg | light/assets
+ $(dark): $(srcdir)/dark/assets.svg | dark/assets
+ 
+ $(light) $(dark):
+-if INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-filename="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-else !INKSCAPE_1_0_OR_NEWER
+-	$(INKSCAPE) --export-id-only --export-png="$@" --export-id="$(basename $(notdir $@))" --export-dpi=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+-endif
++	$(RSVG_CONVERT) --format=png --output="$@" --export-id="$(basename $(notdir $@))" --dpi-y=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) --dpi-x=$(if $(filter $(OPTION_GTK2_HIDPI),true),192,96) "$<" >/dev/null
+ 	$(OPTIPNG) -o7 --quiet "$@"
+ 
+ .PHONY: light dark clean
+diff --git a/common/xfwm4/render-asset.sh b/common/xfwm4/render-asset.sh
+index 6685414..f6198af 100755
+--- a/common/xfwm4/render-asset.sh
++++ b/common/xfwm4/render-asset.sh
+@@ -1,7 +1,7 @@
+ #!/bin/bash
+ set -ueo pipefail
+ 
+-INKSCAPE="$(which inkscape)"
++RSVG_CONVERT="$(which rsvg-convert)"
+ OPTIPNG="$(which optipng)"
+ 
+ ASSETS_DIR="$1"
+@@ -14,9 +14,9 @@ if [[ -f "${result_file}" ]] ; then
+ 	echo "${result_file} already exists."
+ else
+ 	echo "Rendering '${result_file}'"
+-	"$INKSCAPE" --export-id="$i" \
+-				--export-id-only \
+-				--export-png="${result_file}" "$SRC_FILE" >/dev/null \
++	"$RSVG_CONVERT" --export-id="$i" \
++                        --format=png
++                        --output="${result_file}" "$SRC_FILE" >/dev/null \
+ 	&& "$OPTIPNG" -o7 --quiet "${result_file}"
+ fi
+ 
+@@ -26,10 +26,10 @@ if [[ "$OPTION_GTK2_HIDPI" == "true" ]]; then
+ 		echo "${result_file_hidpi} already exists."
+ 	else
+ 		echo "Rendering '${result_file_hidpi}'"
+-		"$INKSCAPE" --export-id="$i" \
+-					--export-id-only \
+-					--export-dpi=192 \
+-					--export-png="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
++		"$RSVG_CONVERT" --export-id="$i" \
++				--dpi-x=192 --dpi-y=192 \
++				--format=png
++			        --output="${result_file_hidpi}" "$SRC_FILE" >/dev/null \
+ 		&& "$OPTIPNG" -o7 --quiet "${result_file_hidpi}"
+ 	fi
+ fi
+diff --git a/configure.ac b/configure.ac
+index f0725f1..1a52cc7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,12 +48,8 @@ AM_CONDITIONAL([GNOME_SHELL_3_32_OR_NEWER], [test "0$GNOME_SHELL_VERSMNR" -ge 31
+ AS_IF([test "x$ENABLE_CINNAMON" != xno], [ARC_CINNAMON])
+ 
+ AS_IF([test "x$ENABLE_GTK2" != xno -o "x$ENABLE_GTK3" != xno -o "x$ENABLE_XFWM" != xno], [
+-    AC_PATH_PROG([INKSCAPE], [inkscape])
+-    AS_IF([test "x$ac_cv_path_INKSCAPE" = x], [AC_MSG_ERROR([inkscape not found])])
+-    AS_IF([test "x$ac_cv_path_INKSCAPE" != x],
+-        [INKSCAPE_VERSMJR=`inkscape --version 2> /dev/null | cut -d' ' -f2 | cut -d'.' -f1`]
+-        AM_CONDITIONAL([INKSCAPE_1_0_OR_NEWER], [test "x$INKSCAPE_VERSMJR" = x1])
+-    )
++    AC_PATH_PROG([RSVG_CONVERT], [rsvg-convert])
++    AS_IF([test "x$ac_cv_path_RSVG_CONVERT" = x], [AC_MSG_ERROR([rsvg-convert not found])])
+     AC_PATH_PROG([OPTIPNG], [optipng])
+     AS_IF([test "x$ac_cv_path_OPTIPNG" = x], [AC_MSG_ERROR([optipng not found])])
+ ])
+-- 
+2.26.0
+