diff options
| author | Bastian Krause <bst@pengutronix.de> | 2021-08-03 11:11:56 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2021-08-05 16:00:37 +0200 |
| commit | 93e780b5baf52c3880ef1708bb3211038e502ed3 (patch) | |
| tree | d9d1e08218625d72b9a5dd356ac075332cdae1eb | |
| parent | b030b380bb6e8b5e7c7bb41e6fcec489988602ac (diff) | |
| download | ptxdist-93e780b5baf52c3880ef1708bb3211038e502ed3.tar.gz ptxdist-93e780b5baf52c3880ef1708bb3211038e502ed3.tar.xz | |
cog: version bump 0.8.1 -> 0.10.0
Signed-off-by: Bastian Krause <bst@pengutronix.de>
Message-Id: <20210803091156.8630-4-bst@pengutronix.de>
[mol: remove applied patch]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch | 31 | ||||
| -rw-r--r-- | patches/cog-0.8.1/series | 4 | ||||
| -rw-r--r-- | rules/cog.make | 4 |
3 files changed, 2 insertions, 37 deletions
diff --git a/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch b/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch deleted file mode 100644 index 9f2a19009..000000000 --- a/patches/cog-0.8.1/0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Bastian Krause <bst@pengutronix.de> -Date: Wed, 14 Apr 2021 17:36:24 +0200 -Subject: [PATCH] CMake: install D-Bus policy configuration to - CMAKE_INSTALL_DATADIR - -The D-BUS system bus policy config should reside in -CMAKE_INSTALL_DATADIR rather than in CMAKE_INSTALL_SYSCONFDIR. - -See: - - https://gitlab.freedesktop.org/dbus/dbus/-/blob/ef55a3db0d8f17848f8a579092fb05900cc076f5/bus/CMakeLists.txt#L117 - -Forwarded: https://github.com/Igalia/cog/pull/296 -Signed-off-by: Bastian Krause <bst@pengutronix.de> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb51087359fc..2fcd63845212 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -157,7 +157,7 @@ if (COG_DBUS_SYSTEM_BUS) - configure_file(dbus/policy.conf.in ${COG_DEFAULT_APPID}.conf @ONLY) - install( - FILES ${CMAKE_CURRENT_BINARY_DIR}/${COG_DEFAULT_APPID}.conf -- DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d -+ DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system.d - COMPONENT "runtime" - ) - diff --git a/patches/cog-0.8.1/series b/patches/cog-0.8.1/series deleted file mode 100644 index 14639312e..000000000 --- a/patches/cog-0.8.1/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-CMake-install-D-Bus-policy-configuration-to-CMAKE_IN.patch -# a7cfa1be71dd856d687d8a3863e5a56f - git-ptx-patches magic diff --git a/rules/cog.make b/rules/cog.make index 3fd9f929a..a59f5a114 100644 --- a/rules/cog.make +++ b/rules/cog.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog # # Paths and names # -COG_VERSION := 0.8.1 -COG_MD5 := 21664fb04c9149dea6d68e13e6074276 +COG_VERSION := 0.10.0 +COG_MD5 := 1b0407b6163a3a01afdfc0fb454a7570 COG := cog-$(COG_VERSION) COG_SUFFIX := tar.xz COG_URL := https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX) |