- updated to 0.10.0

- updated link patch

diff --git a/cog-link.patch b/cog-link.patch
index 97f1d9f6f1fe5a5580fe0dc3644fd7b85b80a8a8..e1e6fd06f0006c06f524e022eaf8a5350bf7cbd8 100644 (file)
--- a/cog-link.patch
+++ b/cog-link.patch
@@ -1,26 +1,18 @@
---- cog-0.5.1/CMakeLists.txt.orig      2020-03-04 19:24:28.912971337 +0100
-+++ cog-0.5.1/CMakeLists.txt   2020-03-04 19:24:32.909616352 +0100
-@@ -120,6 +120,7 @@
-     endif ()
-     add_definitions(-DCOG_BG_COLOR_API_SUPPORTED=1)
- else ()
-+    set(COGCORE_DL_LDFLAGS "-ldl")
-     list(APPEND COGCORE_API_HEADERS core/cog-platform.h)
-     list(APPEND COGCORE_SOURCES core/cog-platform.c)
-     # There is no need to explicitly check wpe-1.0 here because it's a
-@@ -144,7 +145,7 @@
+--- cog-0.10.0/CMakeLists.txt.orig     2021-05-18 17:03:23.000000000 +0200
++++ cog-0.10.0/CMakeLists.txt  2021-08-17 18:55:07.355282549 +0200
+@@ -159,7 +159,7 @@
+     VERSION ${COGCORE_VERSION}
+     SOVERSION ${COGCORE_VERSION_MAJOR}
+ )
+-target_link_libraries(cogcore PkgConfig::WEB_ENGINE PkgConfig::SOUP)
++target_link_libraries(cogcore PkgConfig::WEB_ENGINE PkgConfig::SOUP -ldl)
+ target_compile_definitions(cogcore PRIVATE G_LOG_DOMAIN=\"Cog-Core\")
  if (HAS_WALL)
-   set(COGCORE_CFLAGS ${WEB_ENGINE_CFLAGS_OTHER} ${SOUP_CFLAGS_OTHER} "-Wall")
- endif ()
--set(COGCORE_LDFLAGS ${WEB_ENGINE_LDFLAGS} ${SOUP_LDFLAGS})
-+set(COGCORE_LDFLAGS ${WEB_ENGINE_LDFLAGS} ${SOUP_LDFLAGS} ${COGCORE_DL_LDFLAGS})
- 
- 
- if (COG_DBUS_SYSTEM_BUS)
-@@ -180,7 +181,7 @@
-     if (HAS_WALL)
+     target_compile_options(cogcore PUBLIC -Wall)
+@@ -172,7 +172,7 @@
        target_compile_options(cog PUBLIC "-Wall")
      endif ()
+     target_compile_definitions(cog PRIVATE G_LOG_DOMAIN=\"Cog\")
 -    target_link_libraries(cog cogcore -ldl)
 +    target_link_libraries(cog cogcore)
  

diff --git a/wpe-cog.spec b/wpe-cog.spec
index 6507fef89b17d9ba1f792ff5a00086076b0480e2..94a2e2b415b93c8fc52bde86310ba879ac3a3bd0 100644 (file)
--- a/wpe-cog.spec
+++ b/wpe-cog.spec
@@ -1,24 +1,20 @@
 #
 # Conditional build:
-%bcond_with    gtk             # WebKitGTK+ instead of WPEWebKit
 %bcond_without drm             # DRM platform module
 %bcond_without fdo             # FDO platform module
+%bcond_without gtk4            # GTK4 platform module
+%bcond_without x11             # X11 platform module
 %bcond_with    weston          # direct display support for FDO platform module (requires private protocol files)
 #
-%if %{with gtk}
-%undefine      with_drm
-%undefine      with_fdo
-%undefine      with_weston
-%endif
 Summary:       Cog Core - WPE WebKit base launcher
 Summary(pl.UTF-8):     Cog Core - narzędzie do uruchamiania środowiska WPE WebKit
 Name:          wpe-cog
-Version:       0.8.1
-Release:       3
+Version:       0.10.0
+Release:       1
 License:       MIT
 Group:         Libraries
 Source0:       https://wpewebkit.org/releases/cog-%{version}.tar.xz
-# Source0-md5: 21664fb04c9149dea6d68e13e6074276
+# Source0-md5: 1b0407b6163a3a01afdfc0fb454a7570
 Patch0:                cog-link.patch
 URL:           https://wpewebkit.org/
 BuildRequires: cmake >= 3.3
@@ -27,11 +23,8 @@ BuildRequires:       glib2-devel >= 1:2.44
 BuildRequires: libsoup-devel >= 2.4
 BuildRequires: pkgconfig
 BuildRequires: tar >= 1:1.22
-BuildRequires: xz
-%if %{with gtk}
-BuildRequires: gtk-webkit4-devel >= 2.20.0
-%else
 BuildRequires: wpe-webkit-devel >= 2.28.0
+BuildRequires: xz
 %if %{with drm}
 BuildRequires: EGL-devel
 BuildRequires: Mesa-libgbm-devel >= 13.0
@@ -45,12 +38,22 @@ BuildRequires:      wpebackend-fdo-devel >= 1.3.1
 BuildRequires: EGL-devel
 BuildRequires: wayland-devel >= 1.10
 BuildRequires: wayland-egl-devel
+BuildRequires: wayland-protocols
 BuildRequires: wpebackend-fdo-devel >= 1.3.1
 BuildRequires: xorg-lib-libxkbcommon-devel
 %if %{with weston}
 BuildRequires: weston-protocols >= 9.0.0
 %endif
 %endif
+%if %{with gtk4}
+BuildRequires: gtk4-devel >= 4.0
+BuildRequires: wpebackend-fdo-devel
+%endif
+%if %{with x11}
+BuildRequires: EGL-devel
+BuildRequires: libxcb-devel
+BuildRequires: wpebackend-fdo-devel >= 1.3.1
+BuildRequires: xorg-lib-libxkbcommon-x11-devel
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
 %if %{with drm}
@@ -65,6 +68,9 @@ Requires:     wpebackend-fdo >= 1.3.1
 Requires:      weston >= 9
 %endif
 %endif
+%if %{with x11}
+Requires:      wpebackend-fdo >= 1.3.1
+%endif
 # cog in PLD used to be different project: http://www.krakoa.dk/old-linux-software.html#COG
 Conflicts:     cog
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -80,11 +86,7 @@ Summary:     Cog Core library
 Summary(pl.UTF-8):     Biblioteka Cog Core
 Group:         Libraries
 Requires:      glib2 >= 1:2.44
-%if %{with gtk}
-Requires:      gtk-webkit4 >= 2.20.0
-%else
 Requires:      wpe-webkit >= 2.28.0
-%endif
 
 %description libs
 Cog Core library.
@@ -97,11 +99,7 @@ Summary:     Header files for Cog Core library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki Cog Core
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-%if %{with gtk}
-Requires:      gtk-webkit4-devel >= 2.20.0
-%else
 Requires:      wpe-webkit-devel >= 2.28.0
-%endif
 
 %description devel
 Header files for Cog Core library.
@@ -122,6 +120,8 @@ cd build
        -DCOG_HOME_URI="https://www.pld-linux.org/" \
        %{?with_drm:-DCOG_PLATFORM_DRM=ON} \
        %{!?with_fdo:-DCOG_PLATFORM_FDO=OFF} \
+       %{?with_gtk4:-DCOG_PLATFORM_GTK4=ON} \
+       %{?with_x11:-DCOG_PLATFORM_X11=ON} \
        %{?with_gtk:-DCOG_USE_WEBKITGTK=ON} \
        %{?with_weston:-DCOG_WESTON_DIRECT_DISPLAY=ON}
 
@@ -141,15 +141,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ARCHITECTURE.md COPYING NEWS README.md
+%doc COPYING NEWS README.md
 %attr(755,root,root) %{_bindir}/cog
 %attr(755,root,root) %{_bindir}/cogctl
+%attr(755,root,root) %{_libdir}/libcogplatform-headless.so
 %if %{with drm}
 %attr(755,root,root) %{_libdir}/libcogplatform-drm.so
 %endif
 %if %{with fdo}
 %attr(755,root,root) %{_libdir}/libcogplatform-fdo.so
 %endif
+%if %{with gtk4}
+%attr(755,root,root) %{_libdir}/libcogplatform-gtk4.so
+%endif
+%if %{with x11}
+%attr(755,root,root) %{_libdir}/libcogplatform-x11.so
+%endif
 %{_mandir}/man1/cog.1*
 %{_mandir}/man1/cogctl.1*