installing pkg-config file is fixed upstream

3 files changed, 4 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cdaf841e868c..9e789239f604 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ginkgo-hpc-git
 	pkgdesc = Numerical linear algebra software package
-	pkgver = r7464.577caef4ca
+	pkgver = r7470.b22b8592e2
 	pkgrel = 1
 	url = https://ginkgo-project.github.io/
 	arch = x86_64
@@ -29,9 +29,7 @@ pkgbase = ginkgo-hpc-git
 	depends = hwloc
 	depends = openmpi
 	source = git+https://github.com/ginkgo-project/ginkgo.git
-	source = disable-pkgconfig-file-install.patch
 	sha256sums = SKIP
-	sha256sums = 9aeae9a09de7efda77aa15dc4d57d859b58ea69ce473a549e065e5e2b01b13b7
 
 pkgname = ginkgo-hpc-git
 	optdepends = ginkgo-hpc-docs: for documentation
diff --git a/PKGBUILD b/PKGBUILD
index 5a681893d19b..6ed4cb041a93 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 _pkgname=ginkgo
 pkgbase=ginkgo-hpc-git
 pkgname=(ginkgo-hpc{,-docs,-cuda,-hip}-git)
-pkgver=r7464.577caef4ca
+pkgver=r7470.b22b8592e2
 pkgrel=1
 pkgdesc="Numerical linear algebra software package"
 arch=(x86_64)
@@ -40,22 +40,14 @@ makedepends=(
   rocthrust
   roctracer
 )
-source=("git+https://github.com/ginkgo-project/$_pkgname.git"
-        disable-pkgconfig-file-install.patch)
-sha256sums=('SKIP'
-            '9aeae9a09de7efda77aa15dc4d57d859b58ea69ce473a549e065e5e2b01b13b7')
+source=("git+https://github.com/ginkgo-project/$_pkgname.git")
+sha256sums=('SKIP')
 
 pkgver() {
   cd $_pkgname
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-  # FIXME: installing pkg-config file is broken https://github.com/ginkgo-project/ginkgo/issues/1595
-  cd $_pkgname
-  patch -Np1 -i ../disable-pkgconfig-file-install.patch
-}
-
 build() {
   local common_cmake_flags=(
     -S $_pkgname -G Ninja
diff --git a/disable-pkgconfig-file-install.patch b/disable-pkgconfig-file-install.patch
deleted file mode 100644
index 90370f07bc80..000000000000
--- a/disable-pkgconfig-file-install.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/cmake/install_helpers.cmake b/cmake/install_helpers.cmake
-index 898988142..1e1760270 100644
---- a/cmake/install_helpers.cmake
-+++ b/cmake/install_helpers.cmake
-@@ -73,8 +73,8 @@ function(ginkgo_install)
-         # Step 3: at install time, call the generation script which has all variables
-         #         except the install prefix already replaced. Use the install prefix
-         #         that is specified at install time
--        install(SCRIPT "${Ginkgo_BINARY_DIR}/cmake/generate_pkg_$<CONFIG>.cmake"
--            COMPONENT Ginkgo_Development)
-+        #install(SCRIPT "${Ginkgo_BINARY_DIR}/cmake/generate_pkg_$<CONFIG>.cmake"
-+        #    COMPONENT Ginkgo_Development)
-     endif()
-
-     # install the public header files