Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / libphonenumber
Commits:
7173425d by Jan Alexander Steffens (heftig) at 2024-05-09T23:25:01+02:00
1:8.13.36-1
- - - - -
3 changed files:
- .SRCINFO
- protobuf-targets.diff → 0001-Use-find_package-for-protobuf.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,6 +1,6 @@
pkgbase = libphonenumber
pkgdesc = Google's common library for parsing, formatting, and
validating international phone numbers
- pkgver = 8.13.33
+ pkgver = 8.13.36
pkgrel = 1
epoch = 1
url = https://github.com/googlei18n/libphonenumber
@@ -11,15 +11,19 @@ pkgbase = libphonenumber
makedepends = gtest
makedepends = jre-openjdk-headless
depends = abseil-cpp
+ depends = gcc-libs
+ depends = glibc
depends = icu
depends = protobuf
- source =
git+https://github.com/googlei18n/libphonenumber#commit=5e620bb2637fac7911244fcb53206b2ea8fd65cb
- source = protobuf-targets.diff
- b2sums =
6f8ffdbeda0b53c09f6906f411c2e19fa177729076f896cb5ded6ee9c502f9bda02c28851b8c3d66ed4682a41e263be5ffc9fa28a10b4353dc48b36d299bedcd
- b2sums =
911187934b234eeda64e64513daa2ad7ce5bbb56e91921cad49334286c147acafdaf7343545b3f896ab26ead774902b9f17ace93c8a49ae4b0e9763c0009781e
+ source = git+https://github.com/googlei18n/libphonenumber#tag=v8.13.36
+ source = 0001-Use-find_package-for-protobuf.patch
+ b2sums =
fa08d16f01cb0350cf1ab5fd84828a93aefdc03b8c67fad373405350046213e1e0eefcf06ebb3640e935098c701bf91fd4310d1b3deb75f3239680e6a8f3d798
+ b2sums =
8fc1c65d863051052bb1cb3759a252a3b36a9dffa1335eae4d043821797651e57ca8902cced0672d3c47192b50b9b54436a1551ce65b2e9a4bd82351a58ef1ac
pkgname = libphonenumber
depends = abseil-cpp
+ depends = gcc-libs
+ depends = glibc
depends = icu
depends = protobuf
depends = libicuuc.so
=====================================
protobuf-targets.diff → 0001-Use-find_package-for-protobuf.patch
=====================================
@@ -1,7 +1,18 @@
-diff --git i/cpp/CMakeLists.txt w/cpp/CMakeLists.txt
-index 96def5c8f..304a1a2af 100644
---- i/cpp/CMakeLists.txt
-+++ w/cpp/CMakeLists.txt
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <hef...@archlinux.org>
+Date: Thu, 9 May 2024 23:19:05 +0200
+Subject: [PATCH] Use find_package for protobuf
+
+Use the official protobuf cmake target instead of a custom one; fixes
+build with protobuf 23.
+---
+ cpp/CMakeLists.txt | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
+index 96def5c8f943..304a1a2af484 100644
+--- a/cpp/CMakeLists.txt
++++ b/cpp/CMakeLists.txt
@@ -170,13 +170,11 @@ if (USE_RE2)
endif ()
=====================================
PKGBUILD
=====================================
@@ -1,7 +1,7 @@
# Maintainer: Jan Alexander Steffens (heftig) <hef...@archlinux.org>
pkgname=libphonenumber
-pkgver=8.13.33
+pkgver=8.13.36
pkgrel=1
epoch=1
pkgdesc="Google's common library for parsing, formatting, and validating
international phone numbers"
@@ -10,6 +10,8 @@ arch=(x86_64)
license=('Apache-2.0 AND BSD-3-Clause')
depends=(
abseil-cpp
+ gcc-libs
+ glibc
icu
protobuf
)
@@ -19,25 +21,19 @@ makedepends=(
gtest
jre-openjdk-headless
)
-_commit=5e620bb2637fac7911244fcb53206b2ea8fd65cb # tags/v8.13.33^0
source=(
- "git+$url#commit=$_commit"
- protobuf-targets.diff
+ "git+$url#tag=v$pkgver"
+ 0001-Use-find_package-for-protobuf.patch
)
-b2sums=('6f8ffdbeda0b53c09f6906f411c2e19fa177729076f896cb5ded6ee9c502f9bda02c28851b8c3d66ed4682a41e263be5ffc9fa28a10b4353dc48b36d299bedcd'
-
'911187934b234eeda64e64513daa2ad7ce5bbb56e91921cad49334286c147acafdaf7343545b3f896ab26ead774902b9f17ace93c8a49ae4b0e9763c0009781e')
-
-pkgver() {
- cd $pkgname
- git describe --tags | sed 's/^libphonenumber-\|^v//;s/[^-]*-g/r&/;s/-/+/g'
-}
+b2sums=('fa08d16f01cb0350cf1ab5fd84828a93aefdc03b8c67fad373405350046213e1e0eefcf06ebb3640e935098c701bf91fd4310d1b3deb75f3239680e6a8f3d798'
+
'8fc1c65d863051052bb1cb3759a252a3b36a9dffa1335eae4d043821797651e57ca8902cced0672d3c47192b50b9b54436a1551ce65b2e9a4bd82351a58ef1ac')
prepare() {
cd $pkgname
# Use official protobuf cmake target instead of
# custom one, fixes build with protobuf 23
- git apply -3 ../protobuf-targets.diff
+ git apply -3 ../0001-Use-find_package-for-protobuf.patch
}
build() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libphonenumber/-/commit/7173425d8c1ab7c8040693823610f1fd5c253fca
--
This project does not include diff previews in email notifications.
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/libphonenumber/-/commit/7173425d8c1ab7c8040693823610f1fd5c253fca
You're receiving this email because of your account on gitlab.archlinux.org.
