[arch-commits] Commit in cantor/repos/kde-unstable-x86_64 (4 files)

Antonio Rojas arojas at gemini.archlinux.org
Fri Nov 26 14:48:32 UTC 2021


    Date: Friday, November 26, 2021 @ 14:48:32
  Author: arojas
Revision: 429207

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  cantor/repos/kde-unstable-x86_64/PKGBUILD
    (from rev 429206, cantor/kde-unstable/PKGBUILD)
  cantor/repos/kde-unstable-x86_64/cantor-julia-1.6.patch
    (from rev 429206, cantor/kde-unstable/cantor-julia-1.6.patch)
Deleted:
  cantor/repos/kde-unstable-x86_64/PKGBUILD
  cantor/repos/kde-unstable-x86_64/cantor-julia-1.6.patch

------------------------+
 PKGBUILD               |   74 ++++++++++++------------
 cantor-julia-1.6.patch |  140 +++++++++++++++++++++++------------------------
 2 files changed, 107 insertions(+), 107 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-26 14:48:23 UTC (rev 429206)
+++ PKGBUILD	2021-11-26 14:48:32 UTC (rev 429207)
@@ -1,37 +0,0 @@
-# Maintainer: Felix Yan <felixonmars at archlinux.org>
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=cantor
-pkgver=21.11.80
-pkgrel=1
-pkgdesc='KDE Frontend to Mathematical Software'
-url='https://apps.kde.org/cantor/'
-arch=(x86_64)
-license=(GPL LGPL FDL)
-groups=(kde-applications kde-education)
-depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate qt5-xmlpatterns qt5-tools qt5-webengine poppler-qt5)
-makedepends=(extra-cmake-modules python kdoctools luajit r julia)
-optdepends=('maxima: Maxima backend'
-            'octave: Octave backend'
-            'r: R backend'
-            'luajit: LUA backend'
-            'python: Python backend'
-            'sagemath: SageMath backend'
-            'julia: Julia backend')
-source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
-sha256sums=('0eb90ffaf56e0dceb10a2910b223e0a078e45ef74edf25fcc2aab79966e12a3f'
-            'SKIP')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
-              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
-              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-
-build() {
-  cmake -B build -S $pkgname-$pkgver \
-    -DBUILD_TESTING=OFF
-  cmake --build build
-}
-
-package() {
-  DESTDIR="$pkgdir" cmake --install build
-}

Copied: cantor/repos/kde-unstable-x86_64/PKGBUILD (from rev 429206, cantor/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-11-26 14:48:32 UTC (rev 429207)
@@ -0,0 +1,37 @@
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=cantor
+pkgver=21.11.90
+pkgrel=1
+pkgdesc='KDE Frontend to Mathematical Software'
+url='https://apps.kde.org/cantor/'
+arch=(x86_64)
+license=(GPL LGPL FDL)
+groups=(kde-applications kde-education)
+depends=(analitza libspectre kpty ktexteditor knewstuff libqalculate qt5-xmlpatterns qt5-tools qt5-webengine poppler-qt5)
+makedepends=(extra-cmake-modules python kdoctools luajit r julia)
+optdepends=('maxima: Maxima backend'
+            'octave: Octave backend'
+            'r: R backend'
+            'luajit: LUA backend'
+            'python: Python backend'
+            'sagemath: SageMath backend'
+            'julia: Julia backend')
+source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz{,.sig})
+sha256sums=('6ae8466a60955f8d5e09e65decc130759e817e8c2e8951e62dc790db1c3c8dee'
+            'SKIP')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
+              F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
+              D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+
+build() {
+  cmake -B build -S $pkgname-$pkgver \
+    -DBUILD_TESTING=OFF
+  cmake --build build
+}
+
+package() {
+  DESTDIR="$pkgdir" cmake --install build
+}

Deleted: cantor-julia-1.6.patch
===================================================================
--- cantor-julia-1.6.patch	2021-11-26 14:48:23 UTC (rev 429206)
+++ cantor-julia-1.6.patch	2021-11-26 14:48:32 UTC (rev 429207)
@@ -1,70 +0,0 @@
-diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake
-index c7f64746..aba71a2d 100644
---- a/cmake/FindJulia.cmake
-+++ b/cmake/FindJulia.cmake
-@@ -80,16 +80,46 @@ if(RESULT EQUAL 0)
-         CACHE PATH "Julia library directory")
- endif()
- 
-+if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
-+    set(JULIA_INTERNAL_LIBDL_COMMAND "using Libdl\; abspath(dirname(Libdl.dlpath(\"libjulia-internal\")))")
-+    execute_process(
-+        COMMAND ${JULIA_EXECUTABLE} -E ${JULIA_INTERNAL_LIBDL_COMMAND}
-+        OUTPUT_VARIABLE JULIA_INTERNAL_LIBRARY_DIR
-+        RESULT_VARIABLE RESULT
-+    )
-+
-+    if(RESULT EQUAL 0)
-+        string(REGEX REPLACE "\"" "" JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR})
-+        string(STRIP ${JULIA_INTERNAL_LIBRARY_DIR} JULIA_INTERNAL_LIBRARY_DIR)
-+        set(JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR}
-+            CACHE PATH "Julia internal library directory")
-+    endif()
-+endif()
-+
- find_library( JULIA_LIBRARY
-     NAMES julia
-     PATHS ${JULIA_LIBRARY_DIR}
- )
- 
-+if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
-+    find_library( JULIA_INTERNAL_LIBRARY
-+        NAMES julia-internal
-+        PATHS ${JULIA_INTERNAL_LIBRARY_DIR}
-+    )
-+endif()
- 
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(
--    Julia
--    REQUIRED_VARS   JULIA_LIBRARY JULIA_LIBRARY_DIR JULIA_INCLUDE_DIRS
--    VERSION_VAR     JULIA_VERSION_STRING
--    FAIL_MESSAGE    "Julia not found"
--)
-+if(${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
-+    find_package_handle_standard_args(
-+        Julia
-+        REQUIRED_VARS   JULIA_LIBRARY JULIA_INCLUDE_DIRS
-+        VERSION_VAR     JULIA_VERSION_STRING
-+        FAIL_MESSAGE    "Julia not found"
-+    )
-+else()
-+    find_package_handle_standard_args(
-+        Julia
-+        REQUIRED_VARS   JULIA_LIBRARY JULIA_INTERNAL_LIBRARY JULIA_INCLUDE_DIRS
-+        VERSION_VAR     JULIA_VERSION_STRING
-+        FAIL_MESSAGE    "Julia not found"
-+    )
-+endif()
-diff --git a/src/backends/julia/juliaserver/CMakeLists.txt b/src/backends/julia/juliaserver/CMakeLists.txt
-index 7301eca0..f12628e1 100644
---- a/src/backends/julia/juliaserver/CMakeLists.txt
-+++ b/src/backends/julia/juliaserver/CMakeLists.txt
-@@ -8,6 +8,7 @@ add_executable(cantor_juliaserver ${JuliaServer_SRCS})
- 
- target_link_libraries(cantor_juliaserver
-     ${JULIA_LIBRARY}
-+    ${JULIA_INTERNAL_LIBRARY}
-     Qt5::Widgets
-     Qt5::DBus
- )

Copied: cantor/repos/kde-unstable-x86_64/cantor-julia-1.6.patch (from rev 429206, cantor/kde-unstable/cantor-julia-1.6.patch)
===================================================================
--- cantor-julia-1.6.patch	                        (rev 0)
+++ cantor-julia-1.6.patch	2021-11-26 14:48:32 UTC (rev 429207)
@@ -0,0 +1,70 @@
+diff --git a/cmake/FindJulia.cmake b/cmake/FindJulia.cmake
+index c7f64746..aba71a2d 100644
+--- a/cmake/FindJulia.cmake
++++ b/cmake/FindJulia.cmake
+@@ -80,16 +80,46 @@ if(RESULT EQUAL 0)
+         CACHE PATH "Julia library directory")
+ endif()
+ 
++if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
++    set(JULIA_INTERNAL_LIBDL_COMMAND "using Libdl\; abspath(dirname(Libdl.dlpath(\"libjulia-internal\")))")
++    execute_process(
++        COMMAND ${JULIA_EXECUTABLE} -E ${JULIA_INTERNAL_LIBDL_COMMAND}
++        OUTPUT_VARIABLE JULIA_INTERNAL_LIBRARY_DIR
++        RESULT_VARIABLE RESULT
++    )
++
++    if(RESULT EQUAL 0)
++        string(REGEX REPLACE "\"" "" JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR})
++        string(STRIP ${JULIA_INTERNAL_LIBRARY_DIR} JULIA_INTERNAL_LIBRARY_DIR)
++        set(JULIA_INTERNAL_LIBRARY_DIR ${JULIA_INTERNAL_LIBRARY_DIR}
++            CACHE PATH "Julia internal library directory")
++    endif()
++endif()
++
+ find_library( JULIA_LIBRARY
+     NAMES julia
+     PATHS ${JULIA_LIBRARY_DIR}
+ )
+ 
++if(NOT ${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
++    find_library( JULIA_INTERNAL_LIBRARY
++        NAMES julia-internal
++        PATHS ${JULIA_INTERNAL_LIBRARY_DIR}
++    )
++endif()
+ 
+-include(FindPackageHandleStandardArgs)
+-find_package_handle_standard_args(
+-    Julia
+-    REQUIRED_VARS   JULIA_LIBRARY JULIA_LIBRARY_DIR JULIA_INCLUDE_DIRS
+-    VERSION_VAR     JULIA_VERSION_STRING
+-    FAIL_MESSAGE    "Julia not found"
+-)
++if(${JULIA_VERSION_STRING} VERSION_LESS 1.6.0)
++    find_package_handle_standard_args(
++        Julia
++        REQUIRED_VARS   JULIA_LIBRARY JULIA_INCLUDE_DIRS
++        VERSION_VAR     JULIA_VERSION_STRING
++        FAIL_MESSAGE    "Julia not found"
++    )
++else()
++    find_package_handle_standard_args(
++        Julia
++        REQUIRED_VARS   JULIA_LIBRARY JULIA_INTERNAL_LIBRARY JULIA_INCLUDE_DIRS
++        VERSION_VAR     JULIA_VERSION_STRING
++        FAIL_MESSAGE    "Julia not found"
++    )
++endif()
+diff --git a/src/backends/julia/juliaserver/CMakeLists.txt b/src/backends/julia/juliaserver/CMakeLists.txt
+index 7301eca0..f12628e1 100644
+--- a/src/backends/julia/juliaserver/CMakeLists.txt
++++ b/src/backends/julia/juliaserver/CMakeLists.txt
+@@ -8,6 +8,7 @@ add_executable(cantor_juliaserver ${JuliaServer_SRCS})
+ 
+ target_link_libraries(cantor_juliaserver
+     ${JULIA_LIBRARY}
++    ${JULIA_INTERNAL_LIBRARY}
+     Qt5::Widgets
+     Qt5::DBus
+ )



More information about the arch-commits mailing list