Use protobuf@21 in OS X build

Switch to Qt6 in OS X build
Yet anothe OS X build fix
2024-12-01 07:01:17 +01:00 · 2023-09-21 01:00:14 +02:00 · 2023-09-21 00:45:41 +02:00 · 2023-09-21 00:23:35 +02:00 · 2023-09-21 00:12:48 +02:00 · 2023-09-20 23:48:06 +02:00
2 changed files with 5 additions and 5 deletions
--- a/.github/workflows/osx.yml
+++ b/.github/workflows/osx.yml
@ -11,12 +11,12 @@ jobs:
    runs-on: macos-latest
    steps:
      - name: Set environment variables
-        run: echo "PATH=/usr/local/opt/qt@5/bin:$PATH" >> $GITHUB_ENV
+        run: echo "PATH=/usr/local/opt/protobuf@21/bin:$PATH" >> $GITHUB_ENV
      - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
      - name: Install dependencies
-        run: brew install qt5 protobuf
+        run: brew install qt6 protobuf@21
      - name: Configure build
-        run: qmake PROTOBUF=/usr/local pbfplugin.pro
+        run: qmake PROTOBUF=/usr/local/opt/protobuf@21 pbfplugin.pro
      - name: Build project
        run: make -j3
--- a/src/gzip.cpp
+++ b/src/gzip.cpp
@ -6,7 +6,7 @@

 QByteArray Gzip::uncompress(QIODevice *device, int limit)
 {
-	int ret;
+	int ret = Z_STREAM_END;
 	z_stream strm;
 	unsigned char in[CHUNK];
 	unsigned char out[CHUNK];
Author	SHA1	Message	Date
Martin Tůma	9dba35082b	Use protobuf@21 in OS X build	2023-09-21 01:00:14 +02:00
Martin Tůma	76f1a23f8d	Switch to Qt6 in OS X build	2023-09-21 00:45:41 +02:00
Martin Tůma	f931b653c4	Yet anothe OS X build fix	2023-09-21 00:23:35 +02:00
Martin Tůma	b0885a4b05	Trying to fix the OS X build	2023-09-21 00:12:48 +02:00
Martin Tůma	7c34a2c4e1	Use protobuf@21 in OS X builds	2023-09-20 23:48:06 +02:00
Martin Tůma	0cb3edda05	Fixed compiler warning	2023-09-20 23:36:30 +02:00