tebako 0.13.1 → 0.13.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/CMakeLists.txt +1 -1
  3. data/lib/tebako/cli.rb +2 -1
  4. data/lib/tebako/deploy_helper.rb +3 -4
  5. data/lib/tebako/packager/pass1_patch.rb +9 -1
  6. data/lib/tebako/version.rb +1 -1
  7. data/tools/.github/workflows/test.yml +2 -3
  8. data/tools/ci-scripts/patch-fbthrift.sh +0 -4
  9. data/tools/ci-scripts/patch-folly.sh +0 -5
  10. data/tools/cmake-scripts/setup-libarchive.cmake +7 -3
  11. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1524faa221f3fae3637ac7ac4f7fb84d62d8c3dab17ac606833f5457c8a124a0
4
- data.tar.gz: c50e0dbaf81db65888ee57bd87a4368714a8f9ec732037de1824b62e0f20bae4
3
+ metadata.gz: 4d77900efe08066c5a072e216f0a911c2ea95af3b823497c7b1b145a36b9b221
4
+ data.tar.gz: ba51102446df5fe5812980a4cf81469484f7b733e292f1663b36d2368bd3b3f8
5
5
  SHA512:
6
- metadata.gz: b1743d1621e52aac4868387f792544e8bdd8b0dda55d2767028b30b94c4b1bfa5f57d870e279212a4f04258cc25b401e3e133a46231ff29c5378081783266b1e
7
- data.tar.gz: '02189ef5819acc25ff49bef4ae94b749b77fb53a9a60fd562b7cbca60eea409f97537d8078b967a94353d868408752e49a08bbd63438ab010ecef7d69b9114cb'
6
+ metadata.gz: ae6b34ad86feaa12daa6d35a7309add0615a0754a82fba8fecb925d1e56a2d7f68571db370f23594345a5e464c9016b3200cfefc8927e66188484c4168848e17
7
+ data.tar.gz: 5d5e9c739482c74a688145a246478ef8a9e320b352dbb9203188c7449118bb660cd88559a6ab9cffacf23ca44cebc48932995ee1bf9bdb721b951f8c37a2cbff
data/CMakeLists.txt CHANGED
@@ -319,7 +319,7 @@ endif(IS_GNU)
319
319
  # Ruby
320
320
 
321
321
  set(RUBY_L_FLAGS "-L${DEPS_LIB_DIR} -L${CMAKE_CURRENT_BINARY_DIR}")
322
- set(RUBY_C_FLAGS "-fPIC -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include")
322
+ set(RUBY_C_FLAGS "-fPIC -I${DEPS_INCLUDE_DIR} -I${CMAKE_CURRENT_SOURCE_DIR}/include -Wno-incompatible-pointer-types")
323
323
 
324
324
  # Shadow
325
325
  # https://github.com/deivid-rodriguez/byebug/issues/825
data/lib/tebako/cli.rb CHANGED
@@ -56,8 +56,9 @@ module Tebako
56
56
  desc: "tebako configuration file 'tebafile', '$PWD/.tebako.yml' by default"
57
57
  desc "clean", "Clean tebako packaging environment"
58
58
  def clean
59
- (_, cm) = bootstrap(clean: true)
59
+ (om, cm) = bootstrap(clean: true)
60
60
  cm.clean_cache
61
+ extra_win_clean([om.deps])
61
62
  end
62
63
 
63
64
  desc "clean_ruby", "Clean Ruby source from tebako packaging environment"
data/lib/tebako/deploy_helper.rb CHANGED
@@ -89,10 +89,9 @@ module Tebako
89
89
  puts " ... installing #{name} gem#{" version #{ver}" if ver}"
90
90
 
91
91
  params = [@gem_command, "install", name.to_s]
92
- params.push("-v", ver.to_s) if ver
93
- ["--no-document", "--install-dir", @tgd, "--bindir", @tbd].each do |param|
94
- params.push(param)
95
- end
92
+ params += ["-v", ver.to_s] if ver
93
+ params += ["--no-document", "--install-dir", @tgd, "--bindir", @tbd]
94
+ params += ["--platform", "ruby"] if msys?
96
95
  BuildHelpers.run_with_capture_v(params)
97
96
  end
98
97
 
data/lib/tebako/packager/pass1_patch.rb CHANGED
@@ -189,6 +189,11 @@ module Tebako
189
189
  "wWinMain(HINSTANCE current, HINSTANCE prev, LPWSTR cmdline, int showcmd) /* tebako patched */"
190
190
  }.freeze
191
191
 
192
+ EXT_IO_CONSOLE_WIN32_VK_INC_PATCH = {
193
+ "static const struct vktable *console_win32_vk(/*const char *, unsigned int*/);" =>
194
+ "/* tebako patched */ static const struct vktable *console_win32_vk(const char *, size_t);"
195
+ }.freeze
196
+
192
197
  def patch_map
193
198
  pm = msys_patches
194
199
  pm.merge!(super)
@@ -229,7 +234,10 @@ module Tebako
229
234
  "cygwin/GNUmakefile.in" => gnumakefile_in_patch_p1,
230
235
  # ....................................................
231
236
  # RUBY_EXPORT=1 (shall be set for static builds but is missing in openssl extension)
232
- "ext/openssl/extconf.rb" => OPENSSL_EXTCONF_RB_PATCH
237
+ "ext/openssl/extconf.rb" => OPENSSL_EXTCONF_RB_PATCH,
238
+ # ....................................................
239
+ # Fix the signature of console_win32_vk
240
+ "ext/io/console/win32_vk.inc" => EXT_IO_CONSOLE_WIN32_VK_INC_PATCH
233
241
  }
234
242
  end
235
243
 
data/lib/tebako/version.rb CHANGED
@@ -26,5 +26,5 @@
26
26
  # POSSIBILITY OF SUCH DAMAGE.
27
27
 
28
28
  module Tebako
29
- VERSION = "0.13.1"
29
+ VERSION = "0.13.3"
30
30
  end
data/tools/.github/workflows/test.yml CHANGED
@@ -144,6 +144,7 @@ jobs:
144
144
  run: |
145
145
  set -o errexit -o pipefail -o noclobber -o nounset
146
146
  test -f build/setup-librachive/deps/lib/pkgconfig/libarchive.pc
147
+ test -f build/setup-librachive/deps/lib/libarchive.so || test -f build/setup-librachive/deps/lib/libarchive.dylib
147
148
  test -f build/setup-librachive/deps/lib/libarchive.a
148
149
  test -f build/setup-librachive/deps/include/archive.h
149
150
  test -f build/setup-librachive/deps/include/archive_entry.h
@@ -177,6 +178,7 @@ jobs:
177
178
  run: |
178
179
  set -o errexit -o pipefail -o noclobber -o nounset
179
180
  test -f build/setup-librachive/deps/lib/pkgconfig/libarchive.pc
181
+ test -f build/setup-librachive/deps/lib/libarchive.so || test -f build/setup-librachive/deps/lib/libarchive.dylib
180
182
  test -f build/setup-librachive/deps/lib/libarchive.a
181
183
  test -f build/setup-librachive/deps/include/archive.h
182
184
  test -f build/setup-librachive/deps/include/archive_entry.h
@@ -314,9 +316,6 @@ jobs:
314
316
  - name: Checkout
315
317
  uses: actions/checkout@v4
316
318
 
317
- - name: Checkout
318
- uses: actions/checkout@v4
319
-
320
319
  - name: Install packages
321
320
  run: brew install flex bison bash
322
321
 
data/tools/ci-scripts/patch-fbthrift.sh CHANGED
@@ -52,10 +52,6 @@ else
52
52
  exit 1
53
53
  fi
54
54
 
55
- re="cmake_minimum_required(VERSION 3.1.3 FATAL_ERROR)"
56
- sbst="cmake_minimum_required(VERSION 3.24.0)"
57
- do_patch "$1/CMakeLists.txt" "$re" "$sbst"
58
-
59
55
  if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
60
56
  re="ftruncate(file\.fd(), finalBufferSize),"
61
57
  sbst="folly::portability::unistd::ftruncate(file.fd(), finalBufferSize), \/* tebako patched *\/"
data/tools/ci-scripts/patch-folly.sh CHANGED
@@ -148,11 +148,6 @@ funky_formatter_patch() {
148
148
  do_patch "$1" "$re" "$sbst"
149
149
  }
150
150
 
151
-
152
- re="cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)"
153
- sbst="cmake_minimum_required(VERSION 3.24.0)"
154
- do_patch "$1/CMakeLists.txt" "$re" "$sbst"
155
-
156
151
  if [[ "$OSTYPE" == "linux-musl"* ]]; then
157
152
  # https://github.com/facebook/folly/issues/1478
158
153
  re="#elif defined(__FreeBSD__)"
data/tools/cmake-scripts/setup-libarchive.cmake CHANGED
@@ -23,7 +23,7 @@
23
23
  # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
24
24
  # POSSIBILITY OF SUCH DAMAGE.
25
25
 
26
- def_ext_prj_t(LIBARCHIVE "3.7.9" "ed8b5732e4cd6e30fae909fb945cad8ff9cb7be5c6cdaa3944ec96e4a200c04c")
26
+ def_ext_prj_t(LIBARCHIVE "3.6.2" "9e2c1b80d5fbe59b61308fdfab6c79b5021d7ff4ff2489fb12daf0a96a83551d")
27
27
 
28
28
  message(STATUS "Collecting libarchive - " v${LIBARCHIVE_VER} " at " ${LIBARCHIVE_SOURCE_DIR})
29
29
 
@@ -74,11 +74,15 @@ endif(DEFINED TEBAKO_BUILD_TARGET)
74
74
  # Method #1 is implemented here.
75
75
  # ...................................................................
76
76
 
77
- set(__LIBARCHIVE "${DEPS}/lib/libarchive.a")
77
+ if(${IS_MSYS})
78
+ set(__LIBARCHIVE "${DEPS}/lib/libarchive_static.a")
79
+ else(${IS_MSYS})
80
+ set(__LIBARCHIVE "${DEPS}/lib/libarchive.a")
81
+ endif(${IS_MSYS})
78
82
 
79
83
  ExternalProject_Add(${LIBARCHIVE_PRJ}
80
84
  PREFIX "${DEPS}"
81
- URL https://www.libarchive.org/downloads/libarchive-${LIBARCHIVE_VER}.tar.xz
85
+ URL http://www.libarchive.org/downloads/libarchive-${LIBARCHIVE_VER}.tar.xz
82
86
  URL_HASH SHA256=${LIBARCHIVE_HASH}
83
87
  DOWNLOAD_NO_PROGRESS true
84
88
  UPDATE_COMMAND ""
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tebako
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.1
4
+ version: 0.13.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2025-04-09 00:00:00.000000000 Z
11
+ date: 2025-04-30 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler