This thread contains a patchset. You're looking at the original emails,
but you may wish to use the patch review UI.
Review patch
2
[alpine-aports] [PATCH] community/glm: upgrade to 0.9.9.5
---
community/glm/APKBUILD | 10 ++++------
community/glm/fix-const-expr.patch | 10 ----------
2 files changed, 4 insertions(+), 16 deletions(-)
delete mode 100644 community/glm/fix-const-expr.patch
diff --git a/community/glm/APKBUILD b/community/glm/APKBUILD
index 738bf0e154..a7e8062e70 100644
--- a/community/glm/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=glm
-pkgver=0.9.9.3
-pkgrel=2
+pkgver=0.9.9.5
+pkgrel=0
pkgdesc="C++ mathematics library for graphics programming"
url="http://glm.g-truc.net/"
arch="noarch"
@@ -10,7 +10,6 @@ makedepends="cmake"
subpackages="$pkgname-dev"
source="https://github.com/g-truc/glm/releases/download/$pkgver/glm-$pkgver.zip
fix-endian-test.patch
- fix-const-expr.patch
"
builddir="$srcdir/$pkgname"
patch_args="--binary -p1"
@@ -37,6 +36,5 @@ package() {
make install DESTDIR="$pkgdir"
}
-sha512sums="eb7589345eb627d9fda84771bd2cf3eb0e4e9e48bf6bb7490bd8844b66558717de5dc96cde9d66e81f7ba4e54090f18dbe1bbccb2452ed0ed8c17cdf7b6e4aa2 glm-0.9.9.3.zip
-54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch
-ef0d6cafbc684f0451b21de82f758480929531dbbce557ace9c9e53f9af65493fe85e1c080f5575efd8da8f0a86dae0cbb0605264d6d58eef1d27db6a6d96e8a fix-const-expr.patch"
+sha512sums="1ec3a4146c61dfc094b66bb63ac8ec2b6604e370a662e716c60fcb1c13af698d11334fb9f566d87311522c746f9559d0322f70522f6df47b4ba78585315bd033 glm-0.9.9.5.zip
+54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch"
diff --git a/community/glm/fix-const-expr.patch b/community/glm/fix-const-expr.patch
deleted file mode 100644
index c977036983..0000000000
--- a/community/glm/fix-const-expr.patch
@@ -1,10 +0,0 @@
---- a/glm/detail/setup.hpp
-+++ b/glm/detail/setup.hpp
-@@ -283,7 +283,6 @@
- #else
- # define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && GLM_HAS_INITIALIZER_LISTS && (\
- ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
-- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC6)) || \
- ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15))))
- #endif
-
--
2.21.0
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
Hi,
Patch doesn't apply cleanly, here is log:
---
Checking patch community/glm/APKBUILD...
Checking patch community/glm/fix-const-expr.patch...
error: while searching for:
--- a/glm/detail/setup.hpp
+++ b/glm/detail/setup.hpp
@@ -283,7 +283,6 @@
#else
# define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && GLM_HAS_INITIALIZER_LISTS && (\
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC6)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15))))
#endif
error: patch failed: community/glm/fix-const-expr.patch:1
error: community/glm/fix-const-expr.patch: patch does not apply
---
Patch doesn't apply because file community/glm/fix-const-expr.patch
contains CRLF line terminators and your patch doesn't have them.
(questioning myself how CRLF passed to aports)
Please fix it and resend or tell me and I will do all needed work.
--
regards
On Wed, 2019-05-15 at 15:27, alpine-mips-patches wrote:
> ---
> community/glm/APKBUILD | 10 ++++------
> community/glm/fix-const-expr.patch | 10 ----------
> 2 files changed, 4 insertions(+), 16 deletions(-)
> delete mode 100644 community/glm/fix-const-expr.patch
>
> diff --git a/community/glm/APKBUILD b/community/glm/APKBUILD
> index 738bf0e154..a7e8062e70 100644
> --- a/community/glm/APKBUILD
> +++ b/community/glm/APKBUILD
> @@ -1,7 +1,7 @@
> # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> pkgname=glm
> -pkgver=0.9.9.3
> -pkgrel=2
> +pkgver=0.9.9.5
> +pkgrel=0
> pkgdesc="C++ mathematics library for graphics programming"
> url="http://glm.g-truc.net/"
> arch="noarch"
> @@ -10,7 +10,6 @@ makedepends="cmake"
> subpackages="$pkgname-dev"
> source="https://github.com/g-truc/glm/releases/download/$pkgver/glm-$pkgver.zip
> fix-endian-test.patch
> - fix-const-expr.patch
> "
> builddir="$srcdir/$pkgname"
> patch_args="--binary -p1"
> @@ -37,6 +36,5 @@ package() {
> make install DESTDIR="$pkgdir"
> }
>
> -sha512sums="eb7589345eb627d9fda84771bd2cf3eb0e4e9e48bf6bb7490bd8844b66558717de5dc96cde9d66e81f7ba4e54090f18dbe1bbccb2452ed0ed8c17cdf7b6e4aa2 glm-0.9.9.3.zip
> -54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch
> -ef0d6cafbc684f0451b21de82f758480929531dbbce557ace9c9e53f9af65493fe85e1c080f5575efd8da8f0a86dae0cbb0605264d6d58eef1d27db6a6d96e8a fix-const-expr.patch"
> +sha512sums="1ec3a4146c61dfc094b66bb63ac8ec2b6604e370a662e716c60fcb1c13af698d11334fb9f566d87311522c746f9559d0322f70522f6df47b4ba78585315bd033 glm-0.9.9.5.zip
> +54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch"
> diff --git a/community/glm/fix-const-expr.patch b/community/glm/fix-const-expr.patch
> deleted file mode 100644
> index c977036983..0000000000
> --- a/community/glm/fix-const-expr.patch
> +++ /dev/null
> @@ -1,10 +0,0 @@
> ---- a/glm/detail/setup.hpp
> -+++ b/glm/detail/setup.hpp
> -@@ -283,7 +283,6 @@
> - #else
> - # define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && GLM_HAS_INITIALIZER_LISTS && (\
> - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
> -- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC6)) || \
> - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15))))
> - #endif
> -
> --
> 2.21.0
>
>
>
>
> ---
> Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
> Help: alpine-aports+help@lists.alpinelinux.org
> ---
>
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---
Hi again,
Did you read my reply to your post?
Sorry, I replied only to mailing list thinking that you are subscribed
to it.
On Wed, 2019-05-22 at 13:04, Milan P. Stanić wrote:
> Hi,
>
> Patch doesn't apply cleanly, here is log:
> ---
> Checking patch community/glm/APKBUILD...
> Checking patch community/glm/fix-const-expr.patch...
> error: while searching for:
> --- a/glm/detail/setup.hpp
> +++ b/glm/detail/setup.hpp
> @@ -283,7 +283,6 @@
> #else
> # define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && GLM_HAS_INITIALIZER_LISTS && (\
> ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
> - ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC6)) || \
> ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15))))
> #endif
>
>
> error: patch failed: community/glm/fix-const-expr.patch:1
> error: community/glm/fix-const-expr.patch: patch does not apply
> ---
>
> Patch doesn't apply because file community/glm/fix-const-expr.patch
> contains CRLF line terminators and your patch doesn't have them.
> (questioning myself how CRLF passed to aports)
>
> Please fix it and resend or tell me and I will do all needed work.
>
> --
> regards
>
> On Wed, 2019-05-15 at 15:27, alpine-mips-patches wrote:
> > ---
> > community/glm/APKBUILD | 10 ++++------
> > community/glm/fix-const-expr.patch | 10 ----------
> > 2 files changed, 4 insertions(+), 16 deletions(-)
> > delete mode 100644 community/glm/fix-const-expr.patch
> >
> > diff --git a/community/glm/APKBUILD b/community/glm/APKBUILD
> > index 738bf0e154..a7e8062e70 100644
> > --- a/community/glm/APKBUILD
> > +++ b/community/glm/APKBUILD
> > @@ -1,7 +1,7 @@
> > # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
> > pkgname=glm
> > -pkgver=0.9.9.3
> > -pkgrel=2
> > +pkgver=0.9.9.5
> > +pkgrel=0
> > pkgdesc="C++ mathematics library for graphics programming"
> > url="http://glm.g-truc.net/"
> > arch="noarch"
> > @@ -10,7 +10,6 @@ makedepends="cmake"
> > subpackages="$pkgname-dev"
> > source="https://github.com/g-truc/glm/releases/download/$pkgver/glm-$pkgver.zip
> > fix-endian-test.patch
> > - fix-const-expr.patch
> > "
> > builddir="$srcdir/$pkgname"
> > patch_args="--binary -p1"
> > @@ -37,6 +36,5 @@ package() {
> > make install DESTDIR="$pkgdir"
> > }
> >
> > -sha512sums="eb7589345eb627d9fda84771bd2cf3eb0e4e9e48bf6bb7490bd8844b66558717de5dc96cde9d66e81f7ba4e54090f18dbe1bbccb2452ed0ed8c17cdf7b6e4aa2 glm-0.9.9.3.zip
> > -54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch
> > -ef0d6cafbc684f0451b21de82f758480929531dbbce557ace9c9e53f9af65493fe85e1c080f5575efd8da8f0a86dae0cbb0605264d6d58eef1d27db6a6d96e8a fix-const-expr.patch"
> > +sha512sums="1ec3a4146c61dfc094b66bb63ac8ec2b6604e370a662e716c60fcb1c13af698d11334fb9f566d87311522c746f9559d0322f70522f6df47b4ba78585315bd033 glm-0.9.9.5.zip
> > +54fd8926e3e8271ea32ff25b433003e7eef5611ac7b3c397c0e3b5cd6b139071dba774964c8ae4f8859523a354fec45e38d4ad8fdd46f930f21ce529cc95a65e fix-endian-test.patch"
> > diff --git a/community/glm/fix-const-expr.patch b/community/glm/fix-const-expr.patch
> > deleted file mode 100644
> > index c977036983..0000000000
> > --- a/community/glm/fix-const-expr.patch
> > +++ /dev/null
> > @@ -1,10 +0,0 @@
> > ---- a/glm/detail/setup.hpp
> > -+++ b/glm/detail/setup.hpp
> > -@@ -283,7 +283,6 @@
> > - #else
> > - # define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && GLM_HAS_INITIALIZER_LISTS && (\
> > - ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
> > -- ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC6)) || \
> > - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15))))
> > - #endif
> > -
> > --
> > 2.21.0
> >
> >
> >
> >
> > ---
> > Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
> > Help: alpine-aports+help@lists.alpinelinux.org
> > ---
> >
>
>
> ---
> Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
> Help: alpine-aports+help@lists.alpinelinux.org
> ---
>
---
Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org
Help: alpine-aports+help@lists.alpinelinux.org
---