2 Коміти 8bc93f27ee ... 7cfab75590

Автор SHA1 Опис Дата
  secext2022 7cfab75590 更新(依赖): rustc 1.80.0 3 місяців тому
  secext2022 f797d25974 更新(AUR): 更新版本 5 місяців тому
7 змінених файлів з 34 додано та 29 видалено
  1. 4 4
      .github/workflows/ci.yml
  2. 10 10
      Cargo.toml
  3. 1 1
      README.md
  4. 4 4
      aur/.SRCINFO
  5. 4 4
      aur/PKGBUILD
  6. 10 5
      build.rs
  7. 1 1
      rpm/ibrus.spec

+ 4 - 4
.github/workflows/ci.yml

@@ -89,8 +89,8 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: ibrus-0.1.0a7-1.fc40.x86_64.rpm
-        path: ~/rpmbuild/RPMS/x86_64/ibrus-0.1.0a7-1.fc40.x86_64.rpm
+        name: ibrus-0.1.0-1.fc40.x86_64.rpm
+        path: ~/rpmbuild/RPMS/x86_64/ibrus-0.1.0-1.fc40.x86_64.rpm
 
     # Fedora 39
     - run: toolbox create -y -d fedora -r 39
@@ -109,5 +109,5 @@ jobs:
 
     - uses: actions/upload-artifact@v4
       with:
-        name: ibrus-0.1.0a7-1.fc39.x86_64.rpm
-        path: ~/rpmbuild/RPMS/x86_64/ibrus-0.1.0a7-1.fc39.x86_64.rpm
+        name: ibrus-0.1.0-1.fc39.x86_64.rpm
+        path: ~/rpmbuild/RPMS/x86_64/ibrus-0.1.0-1.fc39.x86_64.rpm

+ 10 - 10
Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "librush"
-version = "0.1.0-a7"
+version = "0.1.0"
 edition = "2021"
 license = "LGPL-2.1-or-later OR GPL-3.0-or-later"
 
@@ -15,20 +15,20 @@ name="ibrus"
 path="src/bin.rs"
 
 [dependencies]
-log = "^0.4.21"
-serde = "^1.0.203"
-serde_json = "^1.0.117"
-zbus = { version = "^4.2.2", default-features = false }
+log = "^0.4.22"
+serde = "^1.0.204"
+serde_json = "^1.0.120"
+zbus = { version = "^4.4.0", default-features = false }
 arbitrary-int = "1.2.7"
 bitbybit = "1.3.2"
-xkeysym = "0.2.0"
+xkeysym = "0.2.1"
 
-env_logger = "^0.11.3"
-tokio = { version = "^1.38.0", features = ["full"], optional = true }
+env_logger = "^0.11.5"
+tokio = { version = "^1.39.1", features = ["full"], optional = true }
 
 [build-dependencies]
-built = { version = "^0.7.3" }
-vergen = { version = "^8.3.1", features = ["build", "git", "gitcl"] }
+built = { version = "^0.7.4" }
+vergen-gitcl = { version = "^1.0.0", features = ["build"] }
 
 [features]
 default = ["pmim"]

+ 1 - 1
README.md

@@ -96,7 +96,7 @@ Update all dependencies, and rebuild:
 
 Current version number of important dependencies:
 
-- rustc 1.78.0 (9b00956e5 2024-04-29)
+- rustc 1.80.0 (051478957 2024-07-21)
 
   <https://github.com/rust-lang/rust>
 

+ 4 - 4
aur/.SRCINFO

@@ -1,15 +1,15 @@
 pkgbase = librush-bin
 	pkgdesc = ibus module for pmim (a Chinese pinyin input method)
-	pkgver = 0.1.0a4
+	pkgver = 0.1.0a7
 	pkgrel = 1
 	url = https://github.com/fm-elpac/librush
 	arch = x86_64
 	license = LGPL-2.1-or-later OR GPL-3.0-or-later
-	depends = ibus>=1.5.29
+	depends = ibus>=1.5.30
 	optdepends = flatpak: install pmim from flathub
-	source = librush_release_x86_64-unknown-linux-gnu.tar.zst::https://github.com/fm-elpac/librush/releases/download/v0.1.0-a4/librush_release_x86_64-unknown-linux-gnu.tar.zst
+	source = librush_release_x86_64-unknown-linux-gnu.tar.zst::https://github.com/fm-elpac/librush/releases/download/v0.1.0-a7/librush_release_x86_64-unknown-linux-gnu.tar.zst
 	source = pmim_ibrus.xml
-	sha256sums = 228fc1a4ad99404e8575fafa53146d92bcb6e57118c83e0415e9c857914032bb
+	sha256sums = 95a6aaf304c0cfd28d965ad38e6c2257ffdcd5a51baf9d97a65c7edc4152424a
 	sha256sums = 1ee458d6dc9ad97a4afe9939076675b43f236196eb3bd6e9a5a9e7e41ee1ded6
 
 pkgname = librush-bin

+ 4 - 4
aur/PKGBUILD

@@ -1,17 +1,17 @@
 # Maintainer: secext2022 <secext2022 at outlook dot com>
 pkgname=librush-bin
-pkgver=0.1.0a4
+pkgver=0.1.0a7
 pkgrel=1
 # https://github.com/fm-elpac/pmim-ibus
 pkgdesc="ibus module for pmim (a Chinese pinyin input method)"
 arch=('x86_64')
 url="https://github.com/fm-elpac/librush"
 license=('LGPL-2.1-or-later OR GPL-3.0-or-later')
-depends=('ibus>=1.5.29')
+depends=('ibus>=1.5.30')
 optdepends=('flatpak: install pmim from flathub')
-source=('librush_release_x86_64-unknown-linux-gnu.tar.zst::https://github.com/fm-elpac/librush/releases/download/v0.1.0-a4/librush_release_x86_64-unknown-linux-gnu.tar.zst'
+source=('librush_release_x86_64-unknown-linux-gnu.tar.zst::https://github.com/fm-elpac/librush/releases/download/v0.1.0-a7/librush_release_x86_64-unknown-linux-gnu.tar.zst'
         'pmim_ibrus.xml')
-sha256sums=('228fc1a4ad99404e8575fafa53146d92bcb6e57118c83e0415e9c857914032bb'
+sha256sums=('95a6aaf304c0cfd28d965ad38e6c2257ffdcd5a51baf9d97a65c7edc4152424a'
             '1ee458d6dc9ad97a4afe9939076675b43f236196eb3bd6e9a5a9e7e41ee1ded6')
 
 build() {

+ 10 - 5
build.rs

@@ -2,15 +2,20 @@ use std::error::Error;
 use std::path::PathBuf;
 
 use built;
-use vergen::EmitBuilder;
+use vergen_gitcl::{BuildBuilder, Emitter, GitclBuilder};
 
 fn main() -> Result<(), Box<dyn Error>> {
     // 每次编译都重新运行 `build.rs`
-    EmitBuilder::builder()
-        .all_build()
-        .git_describe(true, false, None)
-        .git_sha(false)
+    Emitter::default()
+        .add_instructions(&BuildBuilder::all_build()?)?
+        .add_instructions(
+            &GitclBuilder::default()
+                .describe(true, false, None)
+                .sha(false)
+                .build()?,
+        )?
         .emit()?;
+
     // `.git/index`
     match PathBuf::from("./.git/index").canonicalize() {
         Ok(p) => {

+ 1 - 1
rpm/ibrus.spec

@@ -1,5 +1,5 @@
 Name:       ibrus
-Version:    0.1.0a7
+Version:    0.1.0
 Release:    1%{?dist}
 Summary:    ibus module for pmim (a Chinese pinyin input method)
 License:    LGPL-2.1-or-later OR GPL-3.0-or-later