From b237f0e4ff87efe27be67043d28c0efae94a9a81 Mon Sep 17 00:00:00 2001 From: Ayush Singh Date: Thu, 23 Dec 2021 15:10:06 +0530 Subject: [PATCH] Removing KCountry for now. Cannot find the package providing KCountry.h in Ubuntu. It is present with the normal KI18n in Arch Linux so no idea what to do. --- .github/workflows/rust.yml | 2 +- build.rs | 6 +++--- src/lib.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index d6fa986..9f73146 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -44,7 +44,7 @@ jobs: cached: ${{ steps.cache-qt.outputs.cache-hit }} - name: Install KF5i18n - run: sudo apt install libkf5i18n-dev libkf5i18nlocaledata5 + run: sudo apt install libkf5i18n-dev - name: Build run: cargo build --verbose --all-features - name: Run tests diff --git a/build.rs b/build.rs index e0b71d6..9966b03 100644 --- a/build.rs +++ b/build.rs @@ -72,8 +72,8 @@ fn ki18n_setup(config: &mut cpp_build::Config) { let (kf5_include_path, kf5_library_path) = probe_kf5(); config - .include(kf5_include_path.join("KI18n")) - .include(kf5_include_path.join("KI18nLocaleData")); + // .include(kf5_include_path.join("KI18nLocaleData")) + .include(kf5_include_path.join("KI18n")); println!( "cargo:rustc-link-search={}", @@ -81,7 +81,7 @@ fn ki18n_setup(config: &mut cpp_build::Config) { ); println!("cargo:rustc-link-lib={}", "KF5I18n"); - println!("cargo:rustc-link-lib={}", "KF5I18nLocaleData"); + // println!("cargo:rustc-link-lib={}", "KF5I18nLocaleData"); } fn probe_kf5() -> (PathBuf, PathBuf) { diff --git a/src/lib.rs b/src/lib.rs index a33eb0c..bad8b79 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -47,7 +47,7 @@ pub mod klocalizedcontext; pub mod klocalizedstring; -pub mod kcountry; +// pub mod kcountry; pub mod prelude { pub use crate::klocalizedstring::KLocalizedString;