Skip to content

Commit

Permalink
build(debian): Patch for newer jiconfont-font-awesome
Browse files Browse the repository at this point in the history
  • Loading branch information
ktgw0316 committed Sep 7, 2024
1 parent d1b165e commit 6b3d6a9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 6 deletions.
2 changes: 1 addition & 1 deletion debian/lightzone-Debian_12.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ Package-List:
lightzone deb graphics optional
DEBTRANSFORM-RELEASE: 1
DEBTRANSFORM-TAR: lightzone-5.0.0.beta2.tar.xz
DEBTRANSFORM-SERIES: debian.series-Debian_12
DEBTRANSFORM-SERIES: patches-Debian_12.series
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Index: LightZone/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
Index: LightZone/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
===================================================================
--- LightZone.orig/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
+++ LightZone/lightcrafts/src/com/lightcrafts/ui/toolkit/IconFontFactory.java
--- LightZone.orig/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
+++ LightZone/lightcrafts/src/main/java/com/lightcrafts/ui/toolkit/IconFontFactory.java
@@ -5,7 +5,7 @@
package com.lightcrafts.ui.toolkit;

import jiconfont.IconCode;
-import jiconfont.icons.FontAwesome;
+import jiconfont.icons.font_awesome.FontAwesome;
Expand Down
File renamed without changes.
9 changes: 8 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
#!/usr/bin/make -f

# Patch for JIconFont-FontAwesome 4.7.0.1
JICONFONT_FONT_AWESOME_VERSION=$(shell dpkg -s libjiconfont-font-awesome-java | grep -oP "(?<=^Version: ).+")
JICONFONT_FONT_AWESOME_4_7_0_1=$(shell if $(dpkg --compare-versions $(JICONFONT_FONT_AWESOME_VERSION) ge 4.7.0.1); then echo yes; fi)
ifeq ($(JICONFONT_FONT_AWESOME_4_7_0_1),yes)
export QUILT_PATCH_DIR:=debian/patches-Debian_12
endif

export JAVA_HOME=$(shell readlink -f /usr/bin/javac | sed "s:/bin/javac::")

ANT_OPTIONS=-f $(CURDIR)/linux/build.xml -Dno-ivy=true -Dno-submodule=false
ANT_OPTIONS=-f $(CURDIR)/linux/build.xml -Dno-ivy=true -Dno-submodule=true

%:
dh $@ --with javahelper --buildsystem=ant
Expand Down

0 comments on commit 6b3d6a9

Please sign in to comment.