[SCM] blender/master.cycles: Revert "debian/patches/: #0003 dropped"
mfv-guest at users.alioth.debian.org
mfv-guest at users.alioth.debian.org
Wed Jul 18 12:42:55 UTC 2012
The following commit has been merged in the master.cycles branch:
commit 505ff00269b739d6263e233cfe3065e635ba0819
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date: Wed Jul 18 14:00:28 2012 +0200
Revert "debian/patches/: #0003 dropped"
This reverts commit c8e96f530b9dfb20df411cef5d3dd3f8b30f0c5d.
Seems like without this patch, the system messes installation
paths and blender becomes unusable.
Git-Dch: Ignore
diff --git a/debian/patches/0003-install_in_usr_share.patch b/debian/patches/0003-install_in_usr_share.patch
new file mode 100644
index 0000000..e2ce1b5
--- /dev/null
+++ b/debian/patches/0003-install_in_usr_share.patch
@@ -0,0 +1,25 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sat, 28 Apr 2012 10:50:34 +0200
+Subject: install_in_usr_share
+
+ * Arch-specific files go to /usr/share
+ * Make blender look for systemdir into /usr/share
+---
+ source/creator/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index 65682fb..8371524 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -281,8 +281,8 @@ if(WITH_PYTHON)
+ endif()
+
+ install(
+- DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
+- DESTINATION ${TARGETDIR_VER}
++ DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts/
++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/blender/scripts/
+ PATTERN ".svn" EXCLUDE
+ PATTERN "__pycache__" EXCLUDE
+ PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
diff --git a/debian/patches/0003-filter_docs_to_install.patch b/debian/patches/0004-filter_docs_to_install.patch
similarity index 95%
rename from debian/patches/0003-filter_docs_to_install.patch
rename to debian/patches/0004-filter_docs_to_install.patch
index 414170e..6bb69c8 100644
--- a/debian/patches/0003-filter_docs_to_install.patch
+++ b/debian/patches/0004-filter_docs_to_install.patch
@@ -8,7 +8,7 @@ Install only relevant documentation
1 file changed, 2 deletions(-)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 65682fb..f1dedab 100644
+index 8371524..3632b84 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -226,8 +226,6 @@ else()
diff --git a/debian/patches/0004-locales_directory_install.patch b/debian/patches/0005-locales_directory_install.patch
similarity index 98%
rename from debian/patches/0004-locales_directory_install.patch
rename to debian/patches/0005-locales_directory_install.patch
index 59e7fc7..60596e0 100644
--- a/debian/patches/0004-locales_directory_install.patch
+++ b/debian/patches/0005-locales_directory_install.patch
@@ -50,7 +50,7 @@ index 3c59ca8..4cf617f 100644
return path;
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index f1dedab..f1b0175 100644
+index 3632b84..47b4853 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -293,9 +293,9 @@ endif()
diff --git a/debian/patches/0005-update_manpages.patch b/debian/patches/0006-update_manpages.patch
similarity index 99%
rename from debian/patches/0005-update_manpages.patch
rename to debian/patches/0006-update_manpages.patch
index 9014c65..c4dd497 100644
--- a/debian/patches/0005-update_manpages.patch
+++ b/debian/patches/0006-update_manpages.patch
@@ -150,7 +150,7 @@ index 0000000..d15b0c9
+.SH AUTHORS
+This manpage was written for a Debian GNU/Linux by Kevin Roy <kiniou at gmail.com>.
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index f1b0175..946f143 100644
+index 47b4853..712f608 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -322,6 +322,7 @@ if(UNIX AND NOT APPLE)
diff --git a/debian/patches/0007-do_not_use_version_number_in_system_path.patch b/debian/patches/0007-do_not_use_version_number_in_system_path.patch
deleted file mode 100644
index b690c05..0000000
--- a/debian/patches/0007-do_not_use_version_number_in_system_path.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
-Date: Sun, 15 Jul 2012 16:10:09 +0200
-Subject: do_not_use_version_number_in_system_path
-
-Global installation expects system path to be something
-like /usr/share/blender/scripts/ without version numbers.
----
- source/creator/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index 946f143..c466a36 100644
---- a/source/creator/CMakeLists.txt
-+++ b/source/creator/CMakeLists.txt
-@@ -241,7 +241,7 @@ if(UNIX AND NOT APPLE)
- if(WITH_PYTHON_MODULE)
- set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
- else()
-- set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
-+ set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender)
- endif()
- endif()
-
diff --git a/debian/patches/0006-fix_FTBFS_with_ffmpeg_from_debian.patch b/debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
similarity index 100%
rename from debian/patches/0006-fix_FTBFS_with_ffmpeg_from_debian.patch
rename to debian/patches/0007-fix_FTBFS_with_ffmpeg_from_debian.patch
diff --git a/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
new file mode 100644
index 0000000..53392f0
--- /dev/null
+++ b/debian/patches/0008-do_not_use_version_number_in_the_system_path.patch
@@ -0,0 +1,46 @@
+From: "Matteo F. Vescovi" <mfv.debian at gmail.com>
+Date: Sun, 15 Jul 2012 16:10:09 +0200
+Subject: do_not_use_version_number_in_the_system_path
+
+Global installation expects system patch to be something like
+/usr/share/blender/scripts/ without version numbers.
+---
+ source/blender/blenlib/intern/path_util.c | 4 ++--
+ source/creator/CMakeLists.txt | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/source/blender/blenlib/intern/path_util.c b/source/blender/blenlib/intern/path_util.c
+index 4cf617f..b2a584d 100644
+--- a/source/blender/blenlib/intern/path_util.c
++++ b/source/blender/blenlib/intern/path_util.c
+@@ -90,7 +90,7 @@
+ # else /* new XDG ~/blender/.config/ */
+ # define BLENDER_USER_FORMAT "%s/blender/%s"
+ # endif // WITH_XDG_USER_DIRS
+-# define BLENDER_SYSTEM_FORMAT "%s/blender/%s"
++# define BLENDER_SYSTEM_FORMAT "%s/blender"
+ #endif
+
+ /* local */
+@@ -1040,7 +1040,7 @@ static int get_path_system(char *targetpath, const char *folder_name, const char
+
+ system_base_path = (const char *)GHOST_getSystemDir();
+ if (system_base_path) {
+- BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path, blender_version_decimal(ver));
++ BLI_snprintf(system_path, FILE_MAX, BLENDER_SYSTEM_FORMAT, system_base_path);
+ }
+
+ if (!system_path[0])
+diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
+index 712f608..3cc5a62 100644
+--- a/source/creator/CMakeLists.txt
++++ b/source/creator/CMakeLists.txt
+@@ -241,7 +241,7 @@ if(UNIX AND NOT APPLE)
+ if(WITH_PYTHON_MODULE)
+ set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
+ else()
+- set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
++ set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender)
+ endif()
+ endif()
+
diff --git a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
similarity index 99%
rename from debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
rename to debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
index 8924c60..dbe41fb 100644
--- a/debian/patches/0008-look_for_droid_ttf_with_fontconfig.patch
+++ b/debian/patches/0009-look_for_droid_ttf_with_fontconfig.patch
@@ -250,7 +250,7 @@ index 4b5ea44..2fa648b 100644
/* return 1 when file can be written */
int BLI_file_is_writable(const char *filename)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
-index c466a36..edaf32f 100644
+index 3cc5a62..cbced07 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -294,7 +294,6 @@ if(WITH_INTERNATIONAL)
diff --git a/debian/patches/series b/debian/patches/series
index 479f702..6444683 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,9 @@
0001-blender_thumbnailer.patch
0002-disable_tests.patch
-0003-filter_docs_to_install.patch
-0004-locales_directory_install.patch
-0005-update_manpages.patch
-0006-fix_FTBFS_with_ffmpeg_from_debian.patch
-0007-do_not_use_version_number_in_system_path.patch
-0008-look_for_droid_ttf_with_fontconfig.patch
+0003-install_in_usr_share.patch
+0004-filter_docs_to_install.patch
+0005-locales_directory_install.patch
+0006-update_manpages.patch
+0007-fix_FTBFS_with_ffmpeg_from_debian.patch
+0008-do_not_use_version_number_in_the_system_path.patch
+0009-look_for_droid_ttf_with_fontconfig.patch
--
blender packaging
More information about the pkg-multimedia-commits
mailing list