GNU bug report logs - #56456
[PATCH 0/2] Fix protobuf-2.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 56456 in the body.
You can then email your comments to 56456 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 0/2] Fix protobuf-2.
Date: Fri,  8 Jul 2022 20:47:59 +0000

This patchset fixes the broken protobuf-2 and updates the dependent
pokerth in order to fix that build.

Greg Hogan (2):
  gnu: protobuf-2: Fix broken build.
  gnu: pokerth: Update to 1.1.2-8e6088e4.

 gnu/packages/games.scm    | 129 ++++++++++++++++++--------------------
 gnu/packages/protobuf.scm |   6 +-
 2 files changed, 65 insertions(+), 70 deletions(-)

-- 
2.36.1

Message #8 received at 56456 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 56456 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 1/2] gnu: protobuf-2: Fix broken build.
Date: Fri,  8 Jul 2022 20:49:29 +0000

* gnu/packages/protobuf.scm (protobuf-2): Fix broken build.
[arguments]<#:phases>: Delete 'disable-broken-tests.
---
 gnu/packages/protobuf.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/protobuf.scm b/gnu/packages/protobuf.scm
index f66e3469b8..59f2f361e3 100644
--- a/gnu/packages/protobuf.scm
+++ b/gnu/packages/protobuf.scm
@@ -180,7 +180,11 @@ (define-public protobuf-2
                                   version ".tar.bz2"))
               (sha256
                (base32
-                "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f"))))))
+                "040rcs9fpv4bslhiy43v7dcrzakz4vwwpyqg4jp8bn24sl95ci7f"))))
+    (arguments
+     `(#:phases
+       (modify-phases %standard-phases
+         (delete 'disable-broken-tests))))))
 
 (define-public protobuf-c
   (package
-- 
2.36.1

Message #11 received at 56456 <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: 56456 <at> debbugs.gnu.org
Cc: Greg Hogan <code <at> greghogan.com>
Subject: [PATCH 2/2] gnu: pokerth: Update to 1.1.2-8e6088e4.
Date: Fri,  8 Jul 2022 20:49:30 +0000

* gnu/packages/games.scm (pokerth): Update to 1.1.2-8e6088e4.
[source]: Switch to git-fetch.
[arguments]<#:phases>: Remove substitution for libircclient in
'fix-paths and delete 'fix-build.
---
 gnu/packages/games.scm | 129 +++++++++++++++++++----------------------
 1 file changed, 60 insertions(+), 69 deletions(-)

diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index c6ed6eed00..6f72465c5c 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -12231,76 +12231,67 @@ (define-public neverball
       (license license:gpl2+))))
 
 (define-public pokerth
-  (package
-    (name "pokerth")
-    (version "1.1.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "mirror://sourceforge/pokerth/pokerth/"
-                           version "/pokerth-" version ".tar.gz"))
-       (sha256
-        (base32 "0yi9bj3k8yc1gkwmaf14zbbvvn13n54n1dli8k6j1pkph3p3vjq2"))
-       (modules '((guix build utils)))
-       (snippet
-        '(begin
-           ;; Remove bundled websocketpp.
-           (delete-file-recursively "src/third_party/websocketpp")
-           (substitute* "pokerth_lib.pro"
-             (("src/third_party/websocketpp")
-              ""))
-           #t))))
-    (build-system qt-build-system)
-    (inputs
-     `(("boost" ,boost)
-       ("curl" ,curl)
-       ("gsasl" ,gsasl)
-       ("libgcrypt" ,libgcrypt)
-       ("libircclient" ,libircclient)
-       ("protobuf" ,protobuf-2)         ; remove package when no longer needed
-       ("qtbase" ,qtbase-5)
-       ("sdl" ,(sdl-union (list sdl sdl-mixer)))
-       ("sqlite" ,sqlite)
-       ("tinyxml" ,tinyxml)
-       ("websocketpp" ,websocketpp)
-       ("zlib" ,zlib)))
-    (arguments
-     `(#:tests? #f ; No test suite
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-paths
-           (lambda* (#:key inputs #:allow-other-keys)
-             (substitute* (find-files "." "\\.pro$")
-               (("/opt/gsasl")
-                (assoc-ref inputs "gsasl"))
-               (("\\$\\$\\{PREFIX\\}/include/libircclient")
-                (search-input-directory inputs "/include/libircclient"))
-               (("LIB_DIRS =")
-                (string-append "LIB_DIRS = "
-                               (assoc-ref inputs "boost") "/lib")))
-             #t))
-         (add-after 'unpack 'fix-build
-           (lambda _
-             ;; Fixes for Boost versions >= 1.66.
-             (substitute* '("src/net/common/clientthread.cpp"
-                            "src/net/serveraccepthelper.h")
-               (("boost::asio::socket_base::non_blocking_io command\\(true\\);")
-                "")
-               (("newSock->io_control\\(command\\);")
-                "newSock->non_blocking(true);")
-               (("acceptedSocket->io_control\\(command\\);")
-                "acceptedSocket->non_blocking(true);"))
-             #t))
-         (replace 'configure
-           (lambda* (#:key outputs #:allow-other-keys)
-             (invoke "qmake" "pokerth.pro" "CONFIG+=client"
-                     (string-append "PREFIX=" (assoc-ref outputs "out"))))))))
-    (home-page "https://www.pokerth.net")
-    (synopsis "Texas holdem poker game")
-    (description
-     "With PokerTH you can play the Texas holdem poker game, either against
+  (let ((commit "8e6088e425ace3bb31c1dfc3231bff74891e3e94")
+        (revision "0"))
+    (package
+      (name "pokerth")
+      (version "1.1.2")
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/pokerth/pokerth")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32 "1i7z0zc3sbws1bpgn1rd9nxfin121kl81d0as6f10wlrzndsn3sf"))
+         (modules '((guix build utils)))
+         (snippet
+          '(begin
+             ;; Remove bundled websocketpp.
+             (delete-file-recursively "src/third_party/websocketpp")
+             (substitute* "pokerth_lib.pro"
+               (("src/third_party/websocketpp")
+                ""))
+             #t))))
+      (build-system qt-build-system)
+      (inputs
+       `(("boost" ,boost)
+         ("curl" ,curl)
+         ("gsasl" ,gsasl)
+         ("libgcrypt" ,libgcrypt)
+         ("libircclient" ,libircclient)
+         ("protobuf" ,protobuf-2)         ; remove package when no longer needed
+         ("qtbase" ,qtbase-5)
+         ("sdl" ,(sdl-union (list sdl sdl-mixer)))
+         ("sqlite" ,sqlite)
+         ("tinyxml" ,tinyxml)
+         ("websocketpp" ,websocketpp)
+         ("zlib" ,zlib)))
+      (arguments
+       `(#:tests? #f ; No test suite
+         #:phases
+         (modify-phases %standard-phases
+           (add-after 'unpack 'fix-paths
+             (lambda* (#:key inputs #:allow-other-keys)
+               (substitute* (find-files "." "\\.pro$")
+                 (("/opt/gsasl")
+                  (assoc-ref inputs "gsasl"))
+                 (("LIB_DIRS =")
+                  (string-append "LIB_DIRS = "
+                                 (assoc-ref inputs "boost") "/lib")))
+               #t))
+           (replace 'configure
+             (lambda* (#:key outputs #:allow-other-keys)
+               (invoke "qmake" "pokerth.pro" "CONFIG+=client"
+                       (string-append "PREFIX=" (assoc-ref outputs "out"))))))))
+      (home-page "https://www.pokerth.net")
+      (synopsis "Texas holdem poker game")
+      (description
+       "With PokerTH you can play the Texas holdem poker game, either against
 computer opponents or against real players online.")
-    (license license:agpl3+)))
+      (license license:agpl3+))))
 
 (define-public xblackjack
   (package
-- 
2.36.1

Message #14 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Greg Hogan <code <at> greghogan.com>
To: guix-patches <at> gnu.org, 56456-done <at> debbugs.gnu.org
Subject: Re: [PATCH 0/2] Fix protobuf-2.
Date: Tue, 12 Jul 2022 16:54:44 -0400

On Fri, Jul 8, 2022 at 4:48 PM Greg Hogan <code <at> greghogan.com> wrote:
>
> This patchset fixes the broken protobuf-2 and updates the dependent
> pokerth in order to fix that build.
>
> Greg Hogan (2):
>   gnu: protobuf-2: Fix broken build.
>   gnu: pokerth: Update to 1.1.2-8e6088e4.
>
>  gnu/packages/games.scm    | 129 ++++++++++++++++++--------------------
>  gnu/packages/protobuf.scm |   6 +-
>  2 files changed, 65 insertions(+), 70 deletions(-)
>
> --
> 2.36.1

Closing since fixed in a later patchset.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.