mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-21 21:17:37 -08:00
680fcc66df
This is a major rewrite for a major bump. As we can see in the bug referred below, a *lot* of work can be poured into this ebuild but we can also see that having too large a scope makes us never bump. Thus, I opted for a bump that didn't widen the scope of the v1.0.5 ebuild. We can always improve upon this ebuild later. This work is strongly inspired by maurerpe's fine work at https://github.com/maurerpe/arduino-overlay/tree/master/dev-embedded/arduino-ide but I scaled down the unbundling effort for simplicity's sake. Closes: https://bugs.gentoo.org/525882 Closes: https://github.com/gentoo/gentoo/pull/7166 Package-Manager: Portage-2.3.19, Repoman-2.3.6
27 lines
1.1 KiB
Diff
27 lines
1.1 KiB
Diff
diff --git a/app/src/cc/arduino/packages/formatter/AStyleInterface.java b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
|
|
index 4224bf164..fa92506ba 100644
|
|
--- a/app/src/cc/arduino/packages/formatter/AStyleInterface.java
|
|
+++ b/app/src/cc/arduino/packages/formatter/AStyleInterface.java
|
|
@@ -41,7 +41,7 @@ public class AStyleInterface {
|
|
loadLib(Base.getContentFile(System.mapLibraryName("msvcp100")));
|
|
loadLib(Base.getContentFile(System.mapLibraryName("msvcr100")));
|
|
}
|
|
- loadLib(new File(Base.getContentFile("lib"), System.mapLibraryName("astylej")));
|
|
+ System.loadLibrary("astylej");
|
|
}
|
|
|
|
private static void loadLib(File lib) {
|
|
diff --git a/arduino-core/src/processing/app/Platform.java b/arduino-core/src/processing/app/Platform.java
|
|
index 28a7ba0f5..8a943a8ac 100644
|
|
--- a/arduino-core/src/processing/app/Platform.java
|
|
+++ b/arduino-core/src/processing/app/Platform.java
|
|
@@ -154,7 +154,7 @@ public class Platform {
|
|
}
|
|
|
|
static {
|
|
- loadLib(new File(BaseNoGui.getContentFile("lib"), System.mapLibraryName("listSerialsj")));
|
|
+ System.loadLibrary("listSerialsj");
|
|
}
|
|
|
|
private static void loadLib(File lib) {
|