Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
86
Issues
86
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
33
Merge Requests
33
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chakra
Packages
core
Commits
ab295aa0
Commit
ab295aa0
authored
Mar 10, 2016
by
Xuetian Weng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix breeze-plymouth with upstream patch
parent
6fcc388d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
89 additions
and
3 deletions
+89
-3
breeze-plymouth/PKGBUILD
breeze-plymouth/PKGBUILD
+10
-3
breeze-plymouth/fix-link.patch
breeze-plymouth/fix-link.patch
+24
-0
breeze-plymouth/fix-path.patch
breeze-plymouth/fix-path.patch
+55
-0
No files found.
breeze-plymouth/PKGBUILD
View file @
ab295aa0
...
...
@@ -3,7 +3,7 @@ source ../plasma.conf
pkgname
=
breeze-plymouth
pkgver
=
${
PVersion
}
pkgrel
=
1
pkgrel
=
2
pkgdesc
=
"Breeze theme for Plymouth"
arch
=(
'x86_64'
)
url
=
'https://projects.kde.org/projects/kdereview/breeze-plymouth'
...
...
@@ -12,13 +12,20 @@ depends=('plymouth')
makedepends
=(
'extra-cmake-modules'
)
groups
=(
'plasma'
)
options
=(
"debug"
)
source
=(
"
${
PServer
}
/
${
pkgver
}
/
${
pkgname
}
-
${
PSubVersion
}
.tar.xz"
)
sha256sums
=(
$(
getSum
${
pkgname
}
)
)
source
=(
"
${
PServer
}
/
${
pkgver
}
/
${
pkgname
}
-
${
PSubVersion
}
.tar.xz"
"fix-path.patch"
"fix-link.patch"
)
sha256sums
=(
$(
getSum
${
pkgname
}
)
'e6a41cac24a86f7e2a09970bfaac291b4c2ffa94927abecb4f076da29f4ce5fb'
'218bada0082e1b5eec4fdad3d0ddbd843d9f452a8b0cc5fd021b1e47e624c8fc'
)
prepare
()
{
mkdir
-p
build
cd
${
pkgname
}
-
${
pkgver
}
patch
-p1
-i
../fix-path.patch
patch
-p1
-i
../fix-link.patch
}
build
()
{
...
...
breeze-plymouth/fix-link.patch
0 → 100644
View file @
ab295aa0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dc4a80..1a6acad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@
include(FeatureSummary)
find_package(Plymouth REQUIRED)
+find_library(MATH_LIBRARY m)
+
# Otherwise MODULE libs have a lib prefix, which is not compatible with
# plymouth plugin names (i.e we want breeze-text.so not libbreeze-text.so).
set(CMAKE_SHARED_MODULE_PREFIX "")
diff --git a/breeze-text/CMakeLists.txt b/breeze-text/CMakeLists.txt
index 17501cb..ce8d62a 100644
--- a/breeze-text/CMakeLists.txt
+++ b/breeze-text/CMakeLists.txt
@@ -1,5 +1,5 @@
add_library(breeze-text MODULE plugin.c ply-text-progress-bar.c)
-target_link_libraries(breeze-text ${Plymouth_LIBRARIES})
+target_link_libraries(breeze-text ${Plymouth_LIBRARIES} ${MATH_LIBRARY})
target_include_directories(breeze-text PRIVATE ${Plymouth_INCLUDE_DIRS})
install(TARGETS breeze-text DESTINATION ${Plymouth_PLUGINSDIR})
breeze-plymouth/fix-path.patch
0 → 100644
View file @
ab295aa0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09315ad..1dc4a80 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,6 @@
find_package(Plymouth REQUIRED)
set(CMAKE_SHARED_MODULE_PREFIX "")
add_subdirectory(breeze-text)
-install(DIRECTORY breeze DESTINATION ${Plymouth_THEMESDIR})
+add_subdirectory(breeze)
feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/breeze/CMakeLists.txt b/breeze/CMakeLists.txt
new file mode 100644
index 0000000..559c7fb
--- /dev/null
+++ b/breeze/CMakeLists.txt
@@ -0,0 +1,8 @@
+configure_file(breeze.plymouth.cmake ${CMAKE_CURRENT_BINARY_DIR}/breeze.plymouth)
+
+install(FILES breeze.grub
+ breeze.script
+ ${CMAKE_CURRENT_BINARY_DIR}/breeze.plymouth
+ DESTINATION ${Plymouth_THEMESDIR}/breeze)
+install(DIRECTORY images
+ DESTINATION ${Plymouth_THEMESDIR}/breeze)
diff --git a/breeze/breeze.plymouth b/breeze/breeze.plymouth
deleted file mode 100644
index d31431e..0000000
--- a/breeze/breeze.plymouth
+++ /dev/null
@@ -1,8 +0,0 @@
-[Plymouth Theme]
-Name=Breeze
-Description=A Breeze Splash
-ModuleName=script
-
-[script]
-ImageDir=/lib/plymouth/themes/breeze
-ScriptFile=/lib/plymouth/themes/breeze/breeze.script
diff --git a/breeze/breeze.plymouth.cmake b/breeze/breeze.plymouth.cmake
new file mode 100644
index 0000000..29e13ed
--- /dev/null
+++ b/breeze/breeze.plymouth.cmake
@@ -0,0 +1,9 @@
+[Plymouth Theme]
+Name=Breeze
+Description=A Breeze Splash
+ModuleName=script
+
+[script]
+ImageDir=@Plymouth_THEMESDIR@/breeze
+ScriptFile=@Plymouth_THEMESDIR@/breeze/breeze.script
+
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment