[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/briquolo/files/, games-arcade/briquolo/

2021-06-13 Thread Sam James 
commit: 50861304fe434395c47e915ff4cd6df25f9afaf7
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun 13 16:24:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun 13 17:13:51 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50861304

games-arcade/briquolo: various compile fixes (GCC 11, Clang)

* Fix build with GCC 11 (const)
* Fix build with Clang (widening conversion, patch from FreeBSD)
* Change delimiter in sed away from colon

Closes: https://bugs.gentoo.org/739094
Closes: https://bugs.gentoo.org/790746
Closes: https://bugs.gentoo.org/715738
Signed-off-by: Sam James  gentoo.org>

 games-arcade/briquolo/briquolo-0.5.7.ebuild|  4 ++-
 .../files/briquolo-0.5.7-clang-widening.patch  | 31 ++
 .../files/briquolo-0.5.7-gcc11-fix-const.patch | 12 +
 3 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/games-arcade/briquolo/briquolo-0.5.7.ebuild 
b/games-arcade/briquolo/briquolo-0.5.7.ebuild
index d58d4462cad..fff6d3ea645 100644
--- a/games-arcade/briquolo/briquolo-0.5.7.ebuild
+++ b/games-arcade/briquolo/briquolo-0.5.7.ebuild
@@ -30,6 +30,8 @@ PATCHES=(
"${FILESDIR}"/${P}-gcc43.patch
"${FILESDIR}"/${P}-libpng14.patch
"${FILESDIR}"/${P}-respect-AR.patch
+   "${FILESDIR}"/${P}-gcc11-fix-const.patch
+   "${FILESDIR}"/${P}-clang-widening.patch
 )
 
 src_prepare() {
@@ -40,7 +42,7 @@ src_prepare() {
-e '/^SUBDIRS/s/desktop//' \
Makefile.{in,am} || die
sed -i \
-   -e "/CXXFLAGS/s:-O3:${CXXFLAGS}:" \
+   -e "/CXXFLAGS/s|-O3|${CXXFLAGS}|" \
-e 's:=.*share/locale:=/usr/share/locale:' \
configure{,.ac} || die
sed -i \

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
new file mode 100644
index 000..5afaaefd584
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-clang-widening.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/739094
+https://svnweb.freebsd.org/ports/head/games/briquolo/files/patch-src-MOGL-MOGL_PoliceTTF.h?revision=460698&view=co
+
+Fix types passed to SDL_Rect structure (SDL 1.2)
+
+--- a/src/MOGL/MOGL_PoliceTTF.h
 b/src/MOGL/MOGL_PoliceTTF.h
+@@ -42,10 +42,10 @@
+ {
+ GLuint TextureName;
+ Uint16 carac;
+-unsigned int x1;
+-unsigned int y1;
+-unsigned int x2;
+-unsigned int y2;
++Sint16 x1;
++Sint16 y1;
++int x2;
++int y2;
+ };
+ 
+ struct MOGL_Struct_TextureCarac
+@@ -141,7 +141,7 @@
+ MOGL_Struct_Carac * _Caracteres;
+ MOGL_Struct_Carac * (_Correspondance[256-32]);
+ 
+-unsigned int _LastTextureX, _LastTextureY;
++Sint16 _LastTextureX, _LastTextureY;
+ unsigned int maxHeightCarac;
+ MOGL_Map_Carac _MapCarac;
+ MOGL_Vector_TextureName _VectorTextureName;

diff --git a/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch 
b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
new file mode 100644
index 000..d5d68819675
--- /dev/null
+++ b/games-arcade/briquolo/files/briquolo-0.5.7-gcc11-fix-const.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/790746
+--- a/src/MOGL/MOGL_Fenetre.h
 b/src/MOGL/MOGL_Fenetre.h
+@@ -52,7 +52,7 @@ class MOGL_Fenetre
+   private:
+ struct CompareResolution
+ {
+-bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & y)
++bool operator() (const MOGL_Resolution & x, const MOGL_Resolution & 
y) const
+ {
+   return x.w < y.w;
+ }