diff --git a/x11-packages/cairo-dock-core/build.sh b/x11-packages/cairo-dock-core/build.sh index f2a38960a..777c6e4d1 100644 --- a/x11-packages/cairo-dock-core/build.sh +++ b/x11-packages/cairo-dock-core/build.sh @@ -4,18 +4,11 @@ TERMUX_PKG_LICENSE="GPL-3.0" TERMUX_PKG_MAINTAINER="Yisus7u7 " TERMUX_PKG_VERSION=3.4.1 _COMMIT=6c569e67a2a366e7634224a0133ede51755629cb +TERMUX_PKG_REVISION=1 TERMUX_PKG_SRCURL=https://github.com/Cairo-Dock/cairo-dock-core/archive/${_COMMIT}.zip TERMUX_PKG_SHA256=e59e99147ce9c901b46d4b56b88bd53aeda34292b86fd9fbf2c55d158153f2ec TERMUX_PKG_DEPENDS="atk, dbus-glib, glib, gtk3, pango, libcairo, libx11, xsltproc, libcurl, gdk-pixbuf, harfbuzz, mesa, glu, librsvg, libxcomposite, libwayland, libwayland-protocols, libxinerama, libxrandr, libxrender, libxtst, libxml2" TERMUX_PKG_BUILD_DEPENDS="valac" - -if [ $TERMUX_ARCH == "arm" ]; then - TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DLIB_SUFFIX=32" -elif [ $TERMUX_ARCH == "i686" ]; then - TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DLIB_SUFFIX=32" -else - TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DCMAKE_BUILD_TYPE=\"Release\" -DFORCE_LIB64=yes" -fi - +TERMUX_PKG_EXTRA_CONFIGURE_ARGS="-DFORCE_NOT_LIB64=yes" TERMUX_CMAKE_BUILD="Unix Makefiles" diff --git a/x11-packages/cairo-dock-core/cmake.patch b/x11-packages/cairo-dock-core/src-gldit-CMakeLists.txt.patch similarity index 52% rename from x11-packages/cairo-dock-core/cmake.patch rename to x11-packages/cairo-dock-core/src-gldit-CMakeLists.txt.patch index a8880e854..bdbb8af01 100644 --- a/x11-packages/cairo-dock-core/cmake.patch +++ b/x11-packages/cairo-dock-core/src-gldit-CMakeLists.txt.patch @@ -1,15 +1,12 @@ -diff --git a/src/gldit/CMakeLists.txt b/src/gldit/CMakeLists.txt -index f2340f6..6a06806 100644 ---- a/src/gldit/CMakeLists.txt -+++ b/src/gldit/CMakeLists.txt -@@ -122,8 +122,8 @@ target_link_libraries("gldi" +diff -uNr cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb/src/gldit/CMakeLists.txt cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb.mod/src/gldit/CMakeLists.txt +--- cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb/src/gldit/CMakeLists.txt 2021-03-27 06:23:53.000000000 +0200 ++++ cairo-dock-core-6c569e67a2a366e7634224a0133ede51755629cb.mod/src/gldit/CMakeLists.txt 2021-12-05 11:40:06.757366142 +0200 +@@ -122,8 +122,6 @@ configure_file (${CMAKE_CURRENT_SOURCE_DIR}/gldi.pc.in ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/gldi.pc DESTINATION ${install-pc-path}) install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir}) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${VERSION} DESTINATION ${libdir}) -install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so.${SOVERSION} DESTINATION ${libdir}) -+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir}) -+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/libgldi.so DESTINATION ${libdir}) ########### install files ###############