diff options
| author | t-ask | 2020-02-19 14:58:30 +0100 |
|---|---|---|
| committer | t-ask | 2020-02-19 14:58:30 +0100 |
| commit | 836e5efa63aece33ca6a3280d1e2e87521621b42 (patch) | |
| tree | b20a9985c7497cf422a65a4424ed37b5ee2d249d | |
| parent | dd1faa6a02b03505f07590e5f9f96d54394cbded (diff) | |
| parent | 0fc27b16760674840c8092911263cf2cc924d9ec (diff) | |
| download | aur-836e5efa63aece33ca6a3280d1e2e87521621b42.tar.gz | |
Fix merge conflict
| -rw-r--r-- | PKGBUILD | 3 | ||||
| -rw-r--r-- | substance-designer.desktop | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -31,6 +31,9 @@ package() { ${pkgdir}/usr/share/licenses/${pkgname}/eula.txt rm ${pkgdir}/opt/Allegorithmic/Substance_Designer/eula.txt + # Workaround for https://forum.substance3d.com/index.php/topic,29285.0.html + # rm ${pkgdir}/opt/Allegorithmic/Substance_Designer/libfreetype.so.6 + install -Dm644 -t "${pkgdir}/usr/share/applications" "${srcdir}/substance-designer.desktop" install -Dm644 -t "${pkgdir}/usr/share/icons/hicolor/256x256/apps" "${srcdir}/substance-designer-icon.png" install -Dm755 -t "${pkgdir}/usr/bin" "${srcdir}/substance-designer" diff --git a/substance-designer.desktop b/substance-designer.desktop index fdae7ba8c8e5..2da1f370e71a 100644 --- a/substance-designer.desktop +++ b/substance-designer.desktop @@ -4,7 +4,10 @@ GenericName=Material Authoring Software Description=PBR material design and authoring tool Exec=/usr/bin/substance-designer Icon=substance-designer-icon +<<<<<<< HEAD Version=2019.3.3 +======= +>>>>>>> 0fc27b16760674840c8092911263cf2cc924d9ec Terminal=false Type=Application StartupNotify=true |